-
-The different icons
-
-
-
-Die einzelnen Symbole
-
--#^[url]http://friendi.ca[/url]
+#^[url]https://friendi.ca[/url]
-#^[url=http://friendi.ca]Lesezeichen[/url]
-#[url=http://friendi.ca]^[/url][url=http://friendi.ca]Lesezeichen[/url]
+#^[url=https://friendi.ca]Lesezeichen[/url]
+#[url=https://friendi.ca]^[/url][url=https://friendi.ca]Lesezeichen[/url]
- function text_highlight($s,$lang)
- function text_highlight($s,$lang)
- [tr]
- [th]Kopfzeile 1[/th]
- [th]Kopfzeile 2[/th]
- [th]Kopfzeile 2[/th]
- [/tr]
- [tr]
- [td]Zelle 1[/td]
- [td]Zelle 2[/td]
- [td]Zelle 3[/td]
- [/tr]
- [tr]
- [td]Zelle 4[/td]
- [td]Zelle 5[/td]
- [td]Zelle 6[/td]
- [/tr]
+ [tr]
+ [th]Kopfzeile 1[/th]
+ [th]Kopfzeile 2[/th]
+ [th]Kopfzeile 2[/th]
+ [/tr]
+ [tr]
+ [td]Zelle 1[/td]
+ [td]Zelle 2[/td]
+ [td]Zelle 3[/td]
+ [/tr]
+ [tr]
+ [td]Zelle 4[/td]
+ [td]Zelle 5[/td]
+ [td]Zelle 6[/td]
+ [/tr]
[/table]
| [ul] - [li] Erstes Listenelement - [li] Zweites Listenelement + [li] Erstes Listenelement + [li] Zweites Listenelement [/ul] [list] - [li] Erstes Listenelement - [li] Zweites Listenelement + [li] Erstes Listenelement + [li] Zweites Listenelement [/list] |
|
| [ol] - [li] Erstes Listenelement - [li] Zweites Listenelement + [li] Erstes Listenelement + [li] Zweites Listenelement [/ol] [list=1] - [li] Erstes Listenelement - [li] Zweites Listenelement + [li] Erstes Listenelement + [li] Zweites Listenelement [/list] |
|
| [list=] - [li] Erstes Listenelement - [li] Zweites Listenelement + [li] Erstes Listenelement + [li] Zweites Listenelement [/list] |
|
| [list=i] - [li] Erstes Listenelement - [li] Zweites Listenelement + [li] Erstes Listenelement + [li] Zweites Listenelement [/list] |
|
| [list=I] - [li] Erstes Listenelement - [li] Zweites Listenelement + [li] Erstes Listenelement + [li] Zweites Listenelement [/list] |
|
| [list=a] - [li] Erstes Listenelement - [li] Zweites Listenelement + [li] Erstes Listenelement + [li] Zweites Listenelement [/list] |
|
| [list=A] - [li] Erstes Listenelement - [li] Zweites Listenelement + [li] Erstes Listenelement + [li] Zweites Listenelement [/list] |
|
-
-
- Besucher Deines Profils -
- Besucher Deiner "Gemeinschafts"-Seite -
- Besucher der Profile Deiner Kontakte -
- Suchmaschinen -
Mit diesem Symbol kannst du zeigen, dass dir ein Beitrag gefällt.
+ Mit diesem Symbol kannst du zeigen, dass dir ein Beitrag gefällt.
Falls du diese Eingabe zurücknehmen willst, klicke einfach ein zweites Mal auf das Symbol.
-
Mit diesem Symbol kannst du zeigen, dass dir ein Beitrag nicht gefällt.
+ Mit diesem Symbol kannst du zeigen, dass dir ein Beitrag nicht gefällt.
Falls du diese Eingabe zurücknehmen willst, klicke einfach ein zweites Mal auf das Symbol.
-
Mit diesem Symbol kannst du einen Beitrag weiter verteilen.
-Einfach anklicken und sofort erscheint der Beitrag in deinem Beitragseditor.
+ Mit diesem Symbol kannst du einen Beitrag weiter verteilen.
+Einfach anklicken und sofort erscheint der Beitrag in deinem Beitragseditor.
Am Ende des eingefügten Beitrags erscheint ein Link zum Originalbeitrag.
-
Mit diesem Symbol kannst du einen Beitrag für dich markieren.
-Markierte Beiträge erscheinen in deiner Netzwerk-Seite unter "Markierte".
+ Mit diesem Symbol kannst du einen Beitrag für dich markieren.
+Markierte Beiträge erscheinen in deiner Netzwerk-Seite unter "Markierte".
Wenn du die Markierung entfernen willst, klicke einfach ein zweites Mal auf das Symbol.
-
Mit diesem Symbol kannst du einen tag zum Beitrag hinzufügen und diesen so einem bestimmten Schlagwort zuzuordnen.
-Anschließend kannst du auf diesen tag klicken und alle Beiträge mit diesem tag ansehen.
+ Mit diesem Symbol kannst du einen tag zum Beitrag hinzufügen und diesen so einem bestimmten Schlagwort zuzuordnen.
+Anschließend kannst du auf diesen tag klicken und alle Beiträge mit diesem tag ansehen.
ACHTUNG: tags können nicht mehr entfernt werden.
-
Mit diesem Symbol ist es möglich, die Beiträge in bestimmte Gruppen einzuordnen.
-Dies dient dazu, gewählte Beiträge nach eigenen Vorstellungen zu sortieren und wieder zu finden.
+ Mit diesem Symbol ist es möglich, die Beiträge in bestimmte Gruppen einzuordnen.
+Dies dient dazu, gewählte Beiträge nach eigenen Vorstellungen zu sortieren und wieder zu finden.
Wähle eine vorhandene Gruppe oder gib einen neuen Namen ein. Die erstellten Gruppen findest du unter "Gespeicherte Ordner" in der Netzwerk-Ansicht.
Mit diesem Symbol löschst du deinen eigenen Beitrag bzw. entfernst einen Beitrag einer anderen Person aus deinem Stream.
-
Mit diesem Symbol kannst du mehrere Beiträge auswählen und gesammelt löschen.
+ Mit diesem Symbol kannst du mehrere Beiträge auswählen und gesammelt löschen.
Hierfür gehst du nach dem Markieren aller gewünschten Beiträge auf "Lösche die markierten Beiträge" am Ende der Seite mit allen Beiträgen.
diff --git a/doc/de/user/text-editor.md b/doc/de/user/text-editor.md
new file mode 100644
index 0000000000..a67fc4597b
--- /dev/null
+++ b/doc/de/user/text-editor.md
@@ -0,0 +1,48 @@
+# Beiträge erstellen
+
+Hier findest du eine Übersicht über die verschiedenen Möglichkeiten, deinen Beitrag zu bearbeiten.
+
+Achtung: für dieses Beispiel wurde das Thema "Diabook" genutzt.
+Wenn du ein anderes Design benutzt, wirst du manche dieser Symbole gar nicht oder in anderer Form vorfinden.
+
+
+
+
+Die einzelnen Symbole
+
+
Wenn du auf dieses Symbol klickst, dann kannst du ein Bild von deinem Computer hinzufügen.
+Wenn du eine Internetadresse (URL) eingeben willst, dann kannst du das "Baum"-Symbol im oberen Teil des Editors nutzen.
+Wenn du ein Bild ausgewählt hast, dann erscheint eine Miniaturdarstellung des Bildes im Editor.*
+
+
+
Wenn du dieses Symbol anklickst, dann kannst du weitere Dateien von deinem Computer einfügen. Eine Vorschau des Dateiinhalts erfolgt nicht.*
+
+
+
Wenn du die Kette anklickst, dann kannst du eine Internetadresse (URL) einfügen.
+Im Editor erscheint automatisch eine kurze Information zum eingefügten Link.*
+
+
+
Mit dieser Funktion kannst du die Internetadresse (URL) einer Videodatei einfügen.
+Das Video erscheint dann mit einem Player in deinem Beitrag.
+Da Friendica zur Einbindung [HTML5](http://en.wikipedia.org/wiki/HTML5_video) verwendet, werden je nach Browser verschiedene Videoformate unterstützt (z.B. WebM oder MP4).
+Außerdem kannst du hier die URLs von Videos auf Youtube, Vimeo und manchen anderen Videohostern eingeben.
+Die Videos werden dann mit Vorschaubild angezeigt, nach einem Klick öffnet sich ein eingebetteter Player.*
+
+
+
Mit dieser Funktion kannst du die Internetadresse (URL) einer Sound-Datei einfügen.
+Da Friendica zur Einbindung [HTML5](http://en.wikipedia.org/wiki/HTML5_video) verwendet, werden je nach Browser und Betriebssystem MP3, Ogg oder AAC unterstützt.
+Außerdem kannst du hier auch URLs von manchen Audiohostern wie Soundcloud eingeben, um eine dort gespeicherte Audiodatei mit Player in deinem Beitrag anzuzeigen.*
+
+
+
Wenn du dieses Symbol wählst, dann kannst du deinen Standort festlegen.
+Hier reicht schon eine Angabe wie "Berlin" oder "10775".
+Dieser Eintrag führt anschließend zu einer Suchanfrage bei Google Maps.
+
+
+* wie du Dateien hochladen kannst, erfährst du [hier](help/faq#upload)
+
+**Im Folgenden findest du Symbole weiterer Themen**
+
+Frio 
+
+Vier 
diff --git a/doc/Config.md b/doc/en/admin/config.md
similarity index 98%
rename from doc/Config.md
rename to doc/en/admin/config.md
index afd4e65277..4d8945678b 100644
--- a/doc/Config.md
+++ b/doc/en/admin/config.md
@@ -1,7 +1,4 @@
-Config values that can only be set in config/local.config.php
-==========================================================
-
-* [Home](help)
+# Config values that can only be set in config/local.config.php
Friendica's configuration is done in two places: in PHP array configuration files and in the `config` database table.
Database config values overwrite the same file config values.
diff --git a/doc/FAQ-admin.md b/doc/en/admin/faq.md
similarity index 56%
rename from doc/FAQ-admin.md
rename to doc/en/admin/faq.md
index 993a6c89ef..fc403be9a3 100644
--- a/doc/FAQ-admin.md
+++ b/doc/en/admin/faq.md
@@ -1,22 +1,10 @@
-Frequently Asked Questions (Admin) - FAQ
-==============
+# Frequently asked questions (Admin) - FAQ
-* [Home](help)
-
-* **[Can I configure multiple domains with the same code instance?](help/FAQ-admin#multiple)**
-* **[Where can I find the source code of friendica, addons and themes?](help/FAQ-admin#sources)**
-* **[I've changed the my email address now the admin panel is gone?](help/FAQ-admin#adminaccount1)**
-* **[Can there be more then just one admin for a node?](help/FAQ-admin#adminaccount2)**
-* **[The Database structure seems not to be updated. What can I do?](help/FAQ-admin#dbupdate)**
-
-
-
-### Can I configure multiple domains with the same code instance?
+## Can I configure multiple domains with the same code instance?
No, this function is no longer supported as of Friendica 3.3 onwards.
-
-### Where can I find the source code of friendica, addons and themes?
+## Where can I find the source code of friendica, addons and themes?
You can find the main repository [here](https://github.com/friendica/friendica).
There you will always find the current stable version of friendica.
@@ -25,13 +13,11 @@ Addons are listed at [this page](https://github.com/friendica/friendica-addons).
If you are searching for new themes, you can find them at [github.com/bkil/friendica-themes](https://github.com/bkil/friendica-themes)
-
-### I've changed my email address now the admin panel is gone?
+## I've changed my email address now the admin panel is gone?
Have a look into your config/local.config.php and fix your email address there.
-
-### Can there be more then one admin for a node?
+## Can there be more then one admin for a node?
Yes.
You just have to list more then one email address in the
@@ -42,14 +28,14 @@ The listed emails need to be separated by a comma like this:
'admin_email' => 'mail1@example.com,mail2@example.com',
```
-
-### The Database structure seems not to be updated. What can I do?
+## The Database structure seems not to be updated. What can I do?
Please have a look at the Admin panel under [DB updates](/admin/dbsync/) and follow the link to *check database structure*.
This will start a background process to check if the structure is up to the current definition.
You can manually execute the structure update from the CLI in the base directory of your Friendica installation by running the following command:
-
- bin/console dbstructure update
+```sh
+bin/console dbstructure update
+```
if there occur any errors, please contact the [Friendica Support group](https://forum.friendi.ca/profile/helpers) or discuss in the [Friendica Admins group](https://forum.friendi.ca/profile/admins).
diff --git a/doc/Improve-Performance.md b/doc/en/admin/improve-performance.md
similarity index 77%
rename from doc/Improve-Performance.md
rename to doc/en/admin/improve-performance.md
index 9134cb6c74..2dbfc1f0ac 100644
--- a/doc/Improve-Performance.md
+++ b/doc/en/admin/improve-performance.md
@@ -1,25 +1,20 @@
-How to improve the performance of a Friendica site
-==============
-
-* [Home](help)
+# How to improve the performance of a Friendica server
Feel free to ask in the [Friendica support group](https://forum.friendi.ca/profile/helpers) if you need some clarification about the following instructions or if you need help in any other way.
-System configuration
---------
+## System configuration
-Please go to /admin/site/ on your system and change the following values:
+Please go to `/admin/site/` on your system and change the following values:
Set "JPEG image quality" to 50.
-This value reduces the data that is send from the server to the client. 50 is a value that doesn't influences image quality too much.
+This value reduces the data that is sent from the server to the client. 50 is a value that doesn't influence image quality too much.
Enable "Use MySQL full text engine"
When using MyISAM (default) or InnoDB on MariaDB 10 this speeds up search.
-Addons
---------
+## Addons
Active the following addons:
@@ -43,8 +38,7 @@ They show your performance problems.
Others: Everything else :)
Total: The sum of all above values
-Apache Webserver
---------
+## Apache Webserver
The following Apache modules are recommended:
@@ -53,20 +47,20 @@ The following Apache modules are recommended:
This module tells the client to cache the content of static files so that they aren't fetched with every request.
Enable the module "mod_expires" by typing in "a2enmod expires" as root.
Please add the following lines to your site configuration in the "directory" context.
-
- ExpiresActive on ExpiresDefault "access plus 1 week"
+```
+ExpiresActive on ExpiresDefault "access plus 1 week"
+```
Also see the Apache [2.2](http://httpd.apache.org/docs/2.2/mod/mod_expires.html) / [2.4](https://httpd.apache.org/docs/2.4/mod/mod_expires.html) documentation.
### Compress content
This module compresses the traffic between the web server and the client.
-Enable the module "mod_deflate" by typing in "a2enmod deflate" as root.
+Enable the module `mod_deflate` by typing in `a2enmod deflate` as root.
-Also see the Apache [2.2](http://httpd.apache.org/docs/2.2/mod/mod_deflate.html) / [2.4](https://httpd.apache.org/docs/2.4/mod/mod_deflate.html) documentation.
+Also see the Apache [2.2](https://httpd.apache.org/docs/2.2/mod/mod_deflate.html) / [2.4](https://httpd.apache.org/docs/2.4/mod/mod_deflate.html) documentation.
-PHP
---------
+## PHP
### FCGI
diff --git a/doc/en/admin/install-ejabberd.md b/doc/en/admin/install-ejabberd.md
new file mode 100644
index 0000000000..dfb151d3d3
--- /dev/null
+++ b/doc/en/admin/install-ejabberd.md
@@ -0,0 +1,47 @@
+# Install an ejabberd with synchronized credentials
+
+[Ejabberd](https://www.ejabberd.im/) is a chat server that uses XMPP as messaging protocol that you can use with a large amount of clients.
+In conjunction with the "xmpp" addon it can be used for a web based chat solution for your users.
+
+## Installation
+
+- Change its owner to whichever user is running the server, ie. ejabberd
+```sh
+chown ejabberd:ejabberd /path/to/friendica/bin/auth_ejabberd.php
+```
+
+- Change the access mode, so it is readable only to the user ejabberd and has exec
+```sh
+chmod 700 /path/to/friendica/bin/auth_ejabberd.php
+```
+
+- Edit your ejabberd.cfg file, comment out your auth_method and add:
+```
+{auth_method, external}.
+{extauth_program, "/path/to/friendica/bin/auth_ejabberd.php"}.
+```
+
+- Disable the module "mod_register" and disable the registration:
+```
+{access, register, [{deny, all}]}.
+```
+
+- Enable BOSH:
+ - Enable the module "mod_http_bind"
+ - Edit this line:
+```
+{5280, ejabberd_http, [captcha, http_poll, http_bind]}
+```
+
+ - In your apache configuration for your site add this line:
+```
+ProxyPass /http-bind http://127.0.0.1:5280/http-bind retry=0
+```
+
+- Restart your ejabberd service, you should be able to log in with your friendica credentials
+
+## Other hints
+
+- if a user has a space or a @ in the nickname, the user has to replace these characters:
+ - " " (space) is replaced with "%20"
+ - "@" is replaced with "(a)"
diff --git a/doc/Install.md b/doc/en/admin/install.md
similarity index 82%
rename from doc/Install.md
rename to doc/en/admin/install.md
index 3c162d519b..f1981a0ffb 100644
--- a/doc/Install.md
+++ b/doc/en/admin/install.md
@@ -1,7 +1,7 @@
-# Friendica Installation
+# Friendica installation
-We've tried very hard to ensure that Friendica will run on commodity hosting platforms - such as those used to host Wordpress blogs and Drupal websites.
+We've tried very hard to ensure that Friendica will run on commodity hosting platforms - such as those used to host WordPress blogs and Drupal websites.
We offer a manual and an automatic installation.
But be aware that Friendica is more than a simple web application.
@@ -12,10 +12,10 @@ This kind of functionality requires a bit more of the host system than the typic
Not every PHP/MySQL hosting provider will be able to support Friendica.
Many will.
-But **please** review the [requirements](#Requirements) and confirm these with your hosting provider prior to installation.
+But **please** review the requirements below and confirm these with your hosting provider prior to installation.
## Support
-If you encounter installation issues, please let us know via the [helper](http://forum.friendi.ca/profile/helpers) or the [developer](https://forum.friendi.ca/profile/developers) group or [file an issue](https://github.com/friendica/friendica/issues).
+If you encounter installation issues, please let us know via the [helper](https://forum.friendi.ca/profile/helpers) or the [developer](https://forum.friendi.ca/profile/developers) group or [file an issue](https://github.com/friendica/friendica/issues).
Please be as clear as you can about your operating environment and provide as much detail as possible about any error messages you may see, so that we can prevent it from happening in the future.
Due to the large variety of operating systems and PHP platforms in existence we may have only limited ability to debug your PHP installation or acquire any missing modules - but we will do our best to solve any general code issues.
@@ -27,7 +27,7 @@ Due to the large variety of operating systems and PHP platforms in existence we
### Requirements
-* Apache with mod_rewrite enabled and "[AllowOverride All](https://httpd.apache.org/docs/2.4/mod/core.html#allowoverride)" so you can use a local `.htaccess` file
+* Apache with `mod_rewrite` enabled and "[AllowOverride All](https://httpd.apache.org/docs/2.4/mod/core.html#allowoverride)" so you can use a local `.htaccess` file
* PHP 7.4+
* PHP *command line* access with register_argc_argv set to true in the php.ini file
* Curl, GD, GMP, PDO, mbstring, MySQLi, xml, zip, IntlChar, IDN and OpenSSL extensions
@@ -74,33 +74,40 @@ Clone the [friendica/friendica GitHub repository](https://github.com/friendica/f
This makes the software much easier to update.
The Linux commands to clone the repository into a directory "mywebsite" would be
-
- git clone https://github.com/friendica/friendica.git -b stable mywebsite
+```sh
+git clone https://github.com/friendica/friendica.git -b stable mywebsite
+```
Get the addons by going into your website folder.
-
- cd mywebsite
+```sh
+cd mywebsite
+```
Clone the addon repository (separately):
-
- git clone https://github.com/friendica/friendica-addons.git -b stable addon
+```sh
+git clone https://github.com/friendica/friendica-addons.git -b stable addon
+```
Install the dependencies:
-
- bin/composer.phar run install:prod
+```sh
+bin/composer.phar run install:prod
+```
Make sure the folder *view/smarty3* exists and is writable by the webserver user, in this case *www-data*
-
- mkdir -p view/smarty3
- chown www-data:www-data view/smarty3
- chmod 775 view/smarty3
+```sh
+mkdir -p view/smarty3
+chown www-data:www-data view/smarty3
+chmod 775 view/smarty3
+```
If you want to use the development version of Friendica you can switch to the develop branch in the repository by running
- git checkout develop
- bin/composer.phar run install:prod
- cd addon
- git checkout develop
+```sh
+git checkout develop
+bin/composer.phar run install:prod
+cd addon
+git checkout develop
+```
**Be aware that the develop branch is unstable and may break your Friendica node at any time.**
You should have a recent backup before updating.
@@ -111,19 +118,23 @@ If you encounter a bug, please let us know.
Create an empty database and note the access details (hostname, username, password, database name).
Generate a strong password, then enter mysql with:
- mysql
+```sh
+mysql
+```
Then use the following script using the password you just generated:
- CREATE DATABASE friendicadb;
- CREATE USER 'friendica'@'localhost' IDENTIFIED BY '<likedislikeattendyesattendnoattendmaybehashtagssymbolsurlsuser_mentionsmediauserfriendica_authorfriendica_ownerfriendica_activitiesattachmentsentitiessizeslink.
friendica_activitiesfriendica_commentslink.
senderrecipientlink.
mediumlargethumbsmall-#^[url]http://friendi.ca[/url]
+#^[url]https://friendi.ca[/url]
-#^[url=http://friendi.ca]Bookmark[/url]
-#[url=http://friendi.ca]^[/url][url=http://friendi.ca]Bookmark[/url]
+#^[url=https://friendi.ca]Bookmark[/url]
+#[url=https://friendi.ca]^[/url][url=https://friendi.ca]Bookmark[/url]
- function text_highlight($s,$lang)
- function text_highlight($s,$lang)
- [tr]
- [th]Header 1[/th]
- [th]Header 2[/th]
- [th]Header 2[/th]
- [/tr]
- [tr]
- [td]Cell 1[/td]
- [td]Cell 2[/td]
- [td]Cell 3[/td]
- [/tr]
- [tr]
- [td]Cell 4[/td]
- [td]Cell 5[/td]
- [td]Cell 6[/td]
- [/tr]
+ [tr]
+ [th]Header 1[/th]
+ [th]Header 2[/th]
+ [th]Header 2[/th]
+ [/tr]
+ [tr]
+ [td]Cell 1[/td]
+ [td]Cell 2[/td]
+ [td]Cell 3[/td]
+ [/tr]
+ [tr]
+ [td]Cell 4[/td]
+ [td]Cell 5[/td]
+ [td]Cell 6[/td]
+ [/tr]
[/table]
| [ul] - [li] First list element - [li] Second list element + [li] First list element + [li] Second list element [/ul] [list] - [li] First list element - [li] Second list element + [li] First list element + [li] Second list element [/list] |
|
|
| [ol] - [li] First list element - [li] Second list element + [li] First list element + [li] Second list element [/ol] [list=1] - [li] First list element - [li] Second list element + [li] First list element + [li] Second list element [/list] |
|
|
| [list=] - [li] First list element - [li] Second list element + [li] First list element + [li] Second list element [/list] |
|
|
| [list=i] - [li] First list element - [li] Second list element + [li] First list element + [li] Second list element [/list] |
|
|
| [list=I] - [li] First list element - [li] Second list element + [li] First list element + [li] Second list element [/list] |
|
|
| [list=a] - [li] First list element - [li] Second list element + [li] First list element + [li] Second list element [/list] |
|
|
| [list=A] - [li] First list element - [li] Second list element + [li] First list element + [li] Second list element [/list] |
that I wanted to share with you.[/abstract] Today I was in the woods and took some real cool pictures ... |
For Twitter and App.net the system will use the defined abstracts. -For other networks (e.g. when you are using the "statusnet" connector that is used to post to your GNU Social account) the general abstract element will be used. |
+For other networks (e.g. when you are using the "StatusNet" connector that is used to post to your GNU Social account) the general abstract element will be used.
-
-
- [pre] Spaces[/pre] +
- [pre] Spaces[/pre]
diff --git a/doc/Bugs-and-Issues.md b/doc/en/user/bugs-and-issues.md similarity index 91% rename from doc/Bugs-and-Issues.md rename to doc/en/user/bugs-and-issues.md index 126f6af58e..f47e1388cb 100644 --- a/doc/Bugs-and-Issues.md +++ b/doc/en/user/bugs-and-issues.md @@ -1,13 +1,10 @@ -Bugs and Issues -=============== - -* [Home](help) +# Bugs and issues If your server has a support page, you should report any bugs/issues you encounter there first. Reporting to your support page before reporting to the developers makes their job easier, as they don't have to deal with bug reports that might not have anything to do with them. Reducing the workload in this way helps us get new features faster. You can also contact the [friendica support group](https://forum.friendi.ca/profile/helpers) and report your problem there. -Bugs are rarely limited to one person, and the chances are somebody from another node has encountered the problem too, and will be able to help you. +Bugs are rarely limited to one person, and the chances are somebody from another node has encountered the issue too, and will be able to help you. If you're a technical user, or your site doesn't have a support page, you'll need to use the [Bug Tracker](https://github.com/friendica/friendica/issues). This is also used for issues with addons. diff --git a/doc/Channels.md b/doc/en/user/channels.md similarity index 98% rename from doc/Channels.md rename to doc/en/user/channels.md index 63d2582170..f61043d716 100644 --- a/doc/Channels.md +++ b/doc/en/user/channels.md @@ -1,7 +1,4 @@ -Channels -===== - -* [Home](help) +# Channels Channels are a way to discover new content or to display content that you might have missed otherwise. There are several predefined channels, additionally you can create your own channels, based on some rules. @@ -18,8 +15,7 @@ On the contact page you can define the channel frequency for every contact. The * Display only few posts: When a contact creates a lot of posts in a short period, this setting reduces the number of displayed posts in every channel. * Never display posts: Posts from this contact will never be displayed in any channel. -Predefined Channels ---- +## Predefined Channels * For you: Posts from contacts you interact with and who interact with you. In detail, it consists of: * Posts from people you interact with on a more than average level. @@ -38,8 +34,7 @@ Predefined Channels * Audio: Posts with audio. * Videos: Posts with videos. -User defined Channels ---- +## User defined Channels In the "Channels" settings you can create your own channels. @@ -54,8 +49,7 @@ Each channel is defined by these values: * Full Text Search: This can be used to include or exclude content, based on the content and some additional keywords. It uses the "boolean mode" operators from MariaDB: https://mariadb.com/kb/en/full-text-index-overview/#in-boolean-mode * Images, Videos, Audio: When selected, you will see content with the selected media type. This can be combined. If none of these fields are checked, you will see any content, with or without attached media. -Additional keywords for the full text search ---- +## Additional keywords for the full text search Additionally to the search for content, there are keywords that can be used in the full text search. Alternatives are presented with "|". diff --git a/doc/Chats.md b/doc/en/user/chats.md similarity index 83% rename from doc/Chats.md rename to doc/en/user/chats.md index 1fd76ec6f7..c9ad57b4f0 100644 --- a/doc/Chats.md +++ b/doc/en/user/chats.md @@ -1,17 +1,13 @@ -Chats -===== - -* [Home](help) +# Chats There are two possibilities to use chat on your friendica site * IRC Chat * Jappix -IRC-Chat Addon ---- +## IRC-Chat Addon -After activating the addon, you can find the chat at [yoursite.com/irc](../irc). +After activating the addon, you can find the chat at `https://your-site.info/irc`. Note: you can use this chat without any login at your site so that everyone could use it. If you follow the link, you will see the login page of the IRC chat. @@ -25,8 +21,8 @@ The first line shows your name and your current IP address. The right part of the window shows all users. The lower part of the window contains an input field. -Jappix Mini ---- +## Jappix Mini + The Jappix Mini Addon creates a chatbox for jabber- and XMPP-contacts. You should already have a jabber/XMPP-account before setting up the addon. @@ -39,9 +35,11 @@ You can use several servers to create an account: ### 1. Basics -At first you have to get the current version. You can either pull it from [GitHub](https://github.com) like so: - - $> cd /var/www/virtual/YOURSPACE/html/addon; git pull +First you have to get the current version. You can either pull it from [GitHub](https://github.com) like so: +```sh +cd /var/www/virtual/YOURSPACE/html/addon +git pull +``` Or you can download a tar archive here: [jappixmini.tgz](https://github.com/friendica/friendica-addons/blob/stable/jappixmini.tgz) (click at „view raw“). @@ -59,13 +57,13 @@ Activate the BOSH proxy. Go to your user account settings next and choose the addon page. Scroll down until you find the Jappix Mini addon settings. -At first you have to activate the addon. +First you have to activate the addon. Now add your Jabber/XMPP name, the domain/server (without "http"; just "jappix.com"). For „Jabber BOSH Host“ you could use "https://bind.jappix.com/". Note that you need another BOSH server if you do not use jappix.com for your XMPP account. -You can find further information in the „Configuration Help“-section below this fields. -At last you have enter your password (there are some more optional options, you can choose). +You can find further information in the „Configuration Help“-section below these fields. +Finally you enter your password (there are some more optional options, you can choose). Finish these steps with "send" to save the entries. Now, you should find the chatbox at the lower right corner of your browser window. diff --git a/doc/Circles-and-Privacy.md b/doc/en/user/circles-and-privacy.md similarity index 93% rename from doc/Circles-and-Privacy.md rename to doc/en/user/circles-and-privacy.md index abec72f15a..b6ddb41370 100644 --- a/doc/Circles-and-Privacy.md +++ b/doc/en/user/circles-and-privacy.md @@ -1,13 +1,9 @@ -Circles and Privacy -================== - -* [Home](help) - +# Circles and privacy Circles are merely collections of friends. But Friendica uses these to unlock some very powerful features. -**Setting Up Circles** +## Setting Up Circles To create a circle, visit your Friendica "Contacts" page and select "Create a new circle". Give the circle a name. @@ -21,7 +17,7 @@ Below that is another box containing all of your friends who are *not* members o If you click on a photo of a person who isn't in the circle, they will be put into the circle. If you click on a photo of a person who is in the circle, they will be removed from it. -**Access Control** +## Access Control Once you have created a circle, you may use it in any access control list. This is the little lock icon beneath the status update box on your home page. @@ -40,7 +36,7 @@ You will see that since you are only viewing a certain circle of people, your st This is how you keep your future employers from seeing what you write to your drinking buddies. You can override this setting, but this makes it easy to separate your conversations into different friend circles. -**Default Post Privacy** +## Default Post Privacy By default, Friendica assumes that you want all of your posts to be private. Therefore, when you sign up, Friendica creates a circle for you that it will automatically add all of your contacts to. @@ -51,7 +47,7 @@ Note that this behaviour can be overridden by your site admin, in which case you If you want your posts to be "public" by default, you can change your default post permissions on your Settings page. You also have the option to change which circles you post to by default or which circle your new contacts get placed into by default. -**Privacy Concerns To Be Aware Of** +## Privacy Concerns To Be Aware Of These private conversations work best when your friends are Friendica members. We know who else can see the conversations - nobody, *unless* your friends cut and paste the messages and send them to others. @@ -66,20 +62,18 @@ If you look at the Contact Edit page for any person, we will tell you whether or Once you have created a post, you can not change the permissions assigned. Within seconds it has been delivered to lots of people - and perhaps everybody it was addressed to. If you mistakenly created a message and wish to take it back, the best you can do is delete it. -We will send out a delete notification to everybody who received the message - and this should wipe out the message with the same speed as it was initially propagated. +We will send out a deleted notification to everybody who received the message - and this should wipe out the message with the same speed as it was initially propagated. In most cases, it will be completely wiped from the Internet - in under a minute. Again, this applies to Friendica networks. Once a message spreads to other networks, it may not be removed quickly, and in some cases, it may not be removed at all. - -Profiles, Photos, and Privacy -============================= +# Profiles, Photos, and Privacy The decentralised nature of Friendica (many websites exchanging information rather than one website which controls everything) has some implications with privacy as it relates to people on other sites. There are things you should be aware of, so you can decide best how to interact privately. -**Photos** +## Photos Sharing photos privately is a problem. We can only share them __privately__ with Friendica members. @@ -90,7 +84,7 @@ Your friends on other networks will be blocked from viewing these private photos Our developers are working on solutions to allow access to your friends - no matter what network they are on. However we take privacy seriously and don't behave like some networks that __pretend__ your photos are private, but make them available to others without proof of identity. -**Profiles** +## Profiles Your profile and "wall" may also be visited by your friends from other networks, and you can block access to these by web visitors that Friendica doesn't know. Be aware that this could include some of your friends on other networks. diff --git a/doc/Connectors.md b/doc/en/user/connectors.md similarity index 72% rename from doc/Connectors.md rename to doc/en/user/connectors.md index 77d44e909f..4542e94fd3 100644 --- a/doc/Connectors.md +++ b/doc/en/user/connectors.md @@ -1,42 +1,34 @@ -Connectors -========== - -* [Home](help) +# Connectors Connectors allow you to connect with external social networks and services. They are only required for posting to existing accounts on for example Bluesky, Tumblr or Twitter. For Bluesky and Tumblr you can also enable a bidirectional synchronisation, so that you can use Friendica to read your timeline from Tumblr or Bluesky. There is also a connector for accessing your email INBOX. -Instructions For Connecting To People On Specific Services -========================================================== +# Instructions For Connecting To People On Specific Services -Friendica ---- +## Friendica You can either connect to others by providing your Identity Address on the 'Connect' page of any Friendica member. -Or you can put their Identity Address into the Connect box on your [Contacts](contacts) page. +Or you can put their Identity Address into the Connect box on your [Contacts](contact) page. -Diaspora ---- +## Diaspora -Add the Diaspora 'handle' to the 'Connect/Follow' text box on your [Contacts](contacts) page. +Add the Diaspora 'handle' to the 'Connect/Follow' text box on your [Contacts](contact) page. -Blogger, Wordpress, RSS feeds, arbitrary web pages ---- +## Blogger, WordPress, RSS feeds, arbitrary web pages -Put the URL into the Connect box on your [Contacts](contacts) page. -PLease note that you will not be able to reply to these contacts. +Put the URL into the Connect box on your [Contacts](contact) page. +PLease note that you will not be able to reply to these contacts. This feed reader feature will allow you to _connect_ with millions of pages on the internet. -All that the pages need to have is a discoverable feed using either the RSS or Atom syndication format, and which provides an author name and a site image in a form which we can extract. +All that the pages need to have is a discoverable feed using either the RSS or Atom syndication format, and which provides an author name and a site image in a form which we can extract. -Email ---- +## Email If the php module for IMAP support is available on your server, Friendica can connect to email contacts as well. Configure the email connector from your [Settings](settings) page. -Once this has been done, you may enter an email address to connect with using the Connect box on your [Contacts](contacts) page. +Once this has been done, you may enter an email address to connect with using the Connect box on your [Contacts](contact) page. They must be the sender of a message which is currently in your INBOX for the connection to succeed. You may include email contacts in private conversations. diff --git a/doc/Remove-Account.md b/doc/en/user/delete-account.md similarity index 95% rename from doc/Remove-Account.md rename to doc/en/user/delete-account.md index 83cb941e80..6e1f0cf044 100644 --- a/doc/Remove-Account.md +++ b/doc/en/user/delete-account.md @@ -1,7 +1,4 @@ -Remove Account -============== - -* [Home](help) +# Deleting an account We don't like to see people leave Friendica, but if you need to remove your account, you should visit the URL diff --git a/doc/events.md b/doc/en/user/events.md similarity index 95% rename from doc/events.md rename to doc/en/user/events.md index 0ec2bc4608..00478b5cff 100644 --- a/doc/events.md +++ b/doc/en/user/events.md @@ -1,7 +1,5 @@ # Events -* [Home](help) - A special form of postings are events. The events you and your contacts share can be found at [/events](/events) on your node. To get there go to your wall and follow the tab "events" @@ -31,14 +29,14 @@ Fields marked with a *** have to be filled. * **Event Finishes**: enter the finishing date/time for the event here When you click in one of these fields a pop-up will be opened that allows you to pick the day and the time. -If you double clicked on the day box in the calendar these fields will be pre-filled for you. +If you double-clicked on the day box in the calendar these fields will be pre-filled for you. The finishing date/time has to be after the beginning date/time of the event. But you don't have to specify it. If the event is open-ended or the finishing date/time does not matter, just select the box below the two first fields. * **Title**: a title for the event * **Description**: a longer description for the event -* **Location**: the location the event will took place +* **Location**: the location the event will take place These three fields describe your events. In the description and location field you can use BBCode to format the text. diff --git a/doc/Export-Import-Contacts.md b/doc/en/user/export-import-contacts.md similarity index 85% rename from doc/Export-Import-Contacts.md rename to doc/en/user/export-import-contacts.md index 824c9e2ebb..7de45c0a6e 100644 --- a/doc/Export-Import-Contacts.md +++ b/doc/en/user/export-import-contacts.md @@ -1,8 +1,6 @@ # Export / Import of followed Contacts -* [Home](help) - -In addition to [move your account](help/Move-Account) you can export and import the list of accounts you follow. +In addition to [move your account](help/user/move-account) you can export and import the list of accounts you follow. The exported list is stored as CSV file that is compatible to the format used by other platforms as e.g. Mastodon, Misskey or Pleroma. ## Export of followed Contacts diff --git a/doc/FAQ.md b/doc/en/user/faq.md similarity index 85% rename from doc/FAQ.md rename to doc/en/user/faq.md index 4e8d9b19eb..cc39c845eb 100644 --- a/doc/FAQ.md +++ b/doc/en/user/faq.md @@ -1,23 +1,6 @@ -Frequently Asked Questions - FAQ -============== +# Frequently asked questions - FAQ -* [Home](help) - -* **[Where I can find help?](help/FAQ#help)** -* **[Why do I get warnings about certificates?](help/FAQ#ssl)** -* **[How can I upload images, files, links, videos and sound files to posts?](help/FAQ#upload)** -* **[Is it possible to have different avatars per profile?](help/FAQ#avatars)** -* **[How can I view Friendica in a certain language?](help/FAQ#language)** -* **[How do blocked, ignored, archived and hidden contacts behave?](help/FAQ#contacts)** -* **[What happens when an account is removed? Is it truly deleted?](help/FAQ#removed)** -* **[Can I subscribe to a hashtag?](help/FAQ#hashtag)** -* **[How to create an RSS feed of the stream?](help/FAQ#rss)** -* **[What friendica clients can I use?](help/FAQ#clients)** - - - - -### Where I can find help? +## Where I can find help? If this FAQ does not answer your question you can always reach out to the community via the following options: @@ -33,8 +16,7 @@ If this FAQ does not answer your question you can always reach out to the commun https://github.com/github/opensource.guide/pull/807 ---> - -### Why do I get warnings about SSL certificates? +## Why do I get warnings about SSL certificates? SSL (Secure Socket Layer) is a technology to encrypt data transfer between computers. Sometimes your browser warns you about a missing or invalid certificate. @@ -44,12 +26,11 @@ These warnings can have three reasons: 2. The server has a self-signed certificate (not recommended). 3. The certificate is expired. -We recommend to talk to the admin(s) of the affected friendica server. (Admins, please see the respective section of the [admin manual](help/SSL).) +We recommend to talk to the admin(s) of the affected friendica server. (Admins, please see the respective section of the [admin manual](help/admin/ssl).) - -### How can I upload images, files, links, videos and sound files to posts? +## How can I upload images, files, links, videos and sound files to posts? -You can upload images from your computer using the [editor](help/Text_editor). +You can upload images from your computer using the [editor](help/user/text-editor). An overview of all uploaded images is listed at *yourpage.com/profile/profilename/photos*. On that page, you can also upload images directly and choose if your contacts will receive a message about this upload. @@ -75,16 +56,14 @@ Therefore, the supported files are dependent on your browser and operating syste Some supported file types are WebM, MP4, MP3 and OGG. See Wikipedia for more of them ([video](http://en.wikipedia.org/wiki/HTML5_video), [audio](http://en.wikipedia.org/wiki/HTML5_audio)). - -### Is it possible to have different avatars per profile? +## Is it possible to have different avatars per profile? Yes. On your Edit/Manage Profiles page, you will find a "change profile photo" link. Clicking this will take you to a page where you can upload a photograph and select which profile it will be associated with. To avoid privacy leakage, we only display the photograph associated with your default profile as the avatar in your posts. - -### How can I view Friendica in a certain language? +## How can I view Friendica in a certain language? You can do this by adding the `lang` parameter to the url in your url bar. The data in the parameter is a [ISO 639-1](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes) code. @@ -101,12 +80,12 @@ in German: When a certain language is forced, the language remains until session is closed. -### How do blocked, ignored, archived and hidden contacts behave? +## How do blocked, ignored, archived and hidden contacts behave? These are various categories of contacts that are restricted in some way. -Many of these types are related to [Safety](help/Safety). +Many of these types are related to [Safety](help/user/safety). -##### Blocked +### Blocked Direct communication will be blocked. Blocked contacts are not included in delivery, and their own posts to you are not imported. @@ -114,7 +93,7 @@ However, their conversations with your friends will still be visible in your str If you remove a contact completely, they can send you another friend request. Blocked contacts cannot do this. They cannot communicate with you directly, only through friends. -##### Ignored +### Ignored Ignored contacts are included in delivery and will receive your posts and private messages. However, we do not import their posts or private messages to you. @@ -122,18 +101,17 @@ Like blocking, you will still see this person's comments to posts made by your f An addon called "blockem" can be installed to collapse/hide all posts from a particular person in your stream if you desire complete blocking of an individual, including their conversations with your other friends. -##### Archived +### Archived Communication is not possible and will not be attempted. However, unlike blocking, existing posts this person made before being archived will be visible in your stream. -##### Hidden +### Hidden The contact not be displayed in your public friend list. However, a hidden contact will appear normally in conversations and this may expose their hidden status to anybody who can see the conversation. - -### What happens when an account is removed? +## What happens when an account is removed? If you remove your account, it will be scheduled for permanent deletion in *seven days*. As soon as you activate the deletion process you won't be able to log in anymore. @@ -143,19 +121,17 @@ After the elapsed time of seven days, all your posts, messages, photos, and pers Your node will also issue removal requests to all your contacts; this will also remove your profile from the global directory if you are listed. Your username cannot be reissued for future sign-ups for security reasons. - -### Can I follow a hashtag? +## Can I follow a hashtag? Yes. Simply add the hashtag to your saved searches. The posts will appear on your network page. For technical reasons, your answers to such posts won't appear on the "personal" tab in the network page and the whole thread isn't accessible via the API. - -### How to create an RSS feed of the stream? +## How to create an RSS feed of the stream? If you want to share your public page via rss you can use one of the following links: -#### RSS feed of your posts +### RSS feed of your posts basic-url.com//feed/[nickname]/posts @@ -171,15 +147,14 @@ Example: Friendica Support https://forum.friendi.ca/feed/helpers/comments - -### What friendica clients can I use? +## What friendica clients can I use? -Friendica supports [Mastodon API](help/API-Mastodon) and [Twitter API | gnusocial](help/api). +Friendica supports [Mastodon API](help/spec/api/mastodon) and [Twitter API | gnusocial](help/spec/api/index). This means you can use some of the Mastodon and Twitter clients for Friendica. The available features are client specific and may differ. Clients dedicated to Friendica are marked in **bold**. -#### Android +### Android * [AndStatus](http://andstatus.org) ([F-Droid](https://f-droid.org/repository/browse/?fdid=org.andstatus.app), [Google Play](https://play.google.com/store/apps/details?id=org.andstatus.app)) * [Fedilab](https://fedilab.app) ([F-Droid](https://f-droid.org/app/fr.gouv.etalab.mastodon), [Google Play](https://play.google.com/store/apps/details?id=app.fedilab.android)) @@ -195,7 +170,7 @@ Clients dedicated to Friendica are marked in **bold**. * [TwidereX](https://github.com/TwidereProject/TwidereX-Android) ([F-Droid](https://f-droid.org/en/packages/com.twidere.twiderex/), [Google Play](https://play.google.com/store/apps/details?id=com.twidere.twiderex)) * [Yuito](https://github.com/accelforce/Yuito) ([Google Play](https://play.google.com/store/apps/details?id=net.accelf.yuito)) -#### iOS +### iOS * [Mastodon](https://joinmastodon.org/apps) ([App Store](https://apps.apple.com/us/app/mastodon-for-iphone/id1571998974)) * **[Relatica](https://gitlab.com/mysocialportal/relatica)** @@ -203,7 +178,7 @@ Clients dedicated to Friendica are marked in **bold**. * [Tooot](https://github.com/tooot-app) ([App Store](https://apps.apple.com/app/id1549772269)) * [TwidereX](https://github.com/TwidereProject/TwidereX-iOS) ([App Store](https://apps.apple.com/app/twidere-x/id1530314034)) -#### Linux +### Linux * [Choqok](https://choqok.kde.org) * **[Relatica](https://gitlab.com/mysocialportal/relatica)** @@ -211,19 +186,19 @@ Clients dedicated to Friendica are marked in **bold**. * [Toot](https://toot.readthedocs.io/en/latest/) * [Whalebird](https://whalebird.social/en/desktop/contents) ([GitHub](https://github.com/h3poteto/whalebird-desktop)) -#### macOS +### macOS * **[Relatica](https://gitlab.com/mysocialportal/relatica)** * [TheDesk](https://thedesk.top/en/) ([GitHub](https://github.com/cutls/TheDesk)) * [Whalebird](https://whalebird.social/en/desktop/contents) ([App Store](https://apps.apple.com/de/app/whalebird/id1378283354), [GitHub](https://github.com/h3poteto/whalebird-desktop)) -#### Windows +### Windows * **[Relatica](https://gitlab.com/mysocialportal/relatica)** * [TheDesk](https://thedesk.top/en/) ([GitHub](https://github.com/cutls/TheDesk)) * [Whalebird](https://whalebird.social/en/desktop/contents) ([Microsoft Store](https://apps.microsoft.com/detail/9nbw4csdv5hc), [GitHub](https://github.com/h3poteto/whalebird-desktop)) -#### Web Frontend +### Web Frontend * [Halcyon](https://www.halcyon.social/) * [Pinafore](https://github.com/nolanlawson/pinafore) diff --git a/doc/en/user/keyboard-shortcuts.md b/doc/en/user/keyboard-shortcuts.md new file mode 100644 index 0000000000..7f55c1d3d5 --- /dev/null +++ b/doc/en/user/keyboard-shortcuts.md @@ -0,0 +1,6 @@ +# Keyboard shortcuts in Friendica + +## General + +* j: Scroll to next thread +* k: Scroll to previous thread diff --git a/doc/Making-Friends.md b/doc/en/user/making-friends.md similarity index 95% rename from doc/Making-Friends.md rename to doc/en/user/making-friends.md index 85d4044cef..1bccd1c3c2 100644 --- a/doc/Making-Friends.md +++ b/doc/en/user/making-friends.md @@ -1,14 +1,11 @@ -Making Friends -============== - -* [Home](help) +# Making friends Friendship in Friendica can sometimes take on different meaning. But let's keep it simple; you want to be friends with somebody. How do you do it? -The Directories ---- +## The Directories + Friendica has two different kinds of "address book". The directory of the Friendica server you are registered on and a global directory to which your and other Friendica servers submit account information. @@ -23,8 +20,7 @@ If you click through to the global directory, you will be presented with a list You will also see a "Show Community Groups" link, which will direct you to Groups. You connect to people and groups the same way, public groups will automatically accept your introduction, whereas private groups and some individual users will need to manually approve it. -Connect to other Friendica users ---- +## Connect to other Friendica users Visit their profile. Just beneath their profile picture will be the word 'Connect' (we're assuming this is an English language profile). @@ -48,8 +44,8 @@ If you already know somebody's Identity Address, you can enter it in the "connec This will take you through a similar process. -Connect to users of alternate networks ---- +## Connect to users of alternate networks + ### Across the Federation and Fediverse You can also use your Identity Address or other people's Identity Addresses to become friends across the so-called Federation/Fediverse of open source social media. Currently, Friendica supports connections with people on diaspora*, Red, Hubzilla, GNU Social, StatusNet, Mastodon, Pleroma, socialhome, and ganggo platforms. @@ -80,31 +76,29 @@ To subscribe to a mailing list, enter the email in following example format "mai You can "follow" almost anybody or any website that produces a syndication feed (RSS/Atom,etc.). If we can find an information stream and a name to attach to the contact, we'll try to connect with them. -Notification ---- +## Notification + When somebody requests friendship you will receive a notification. You will usually need to approve this before the friendship is complete. -Approval ---- +## Approval + Some networks allow people to send you messages without being friends and without your approval. Friendica does not allow this by default, as it would open a gateway for spam. -Unilateral or bilateral friendships ---- +## Unilateral or bilateral friendships + When you receive a friendship notification from another Friendica member, you will have the option of allowing them as a "Follower" or as a "Friend". If they are a follower, they can see what you have to say, including private communications that you send to them, but not vice versa. As a friend, you can both communicate with each other. diaspora* uses a different terminology, and you are given the option of allowing them to "share with you", or being full friends. -Deleting ---- +## Deleting You can delete a friend no matter what the friendship status - which completely removes everything relating to that person from your website. -Unwanted Behaviour ---- +## Unwanted Behaviour If a contact engages in abuse, harrassment, or other unwanted behaviour, there are various actions you can take. These include: @@ -113,4 +107,4 @@ These include: * Ignoring the contact, so that you will not see their posts * Blocking the contact from receiving your posts -For more information, see [Safety](help/Safety). +For more information, see [Safety](help/user/safety). diff --git a/doc/Move-Account.md b/doc/en/user/move-account.md similarity index 91% rename from doc/Move-Account.md rename to doc/en/user/move-account.md index 9e13d7cad8..b78d5f4e40 100644 --- a/doc/Move-Account.md +++ b/doc/en/user/move-account.md @@ -1,8 +1,4 @@ -How to move your account between servers -============ - -* [Home](help) - +# Moving an account between servers ! **This is an experimental feature** @@ -14,13 +10,12 @@ How to move your account between servers * Load your saved account file and click "Import". * After the move, the account on the old server will not work reliably anymore, and should be not used. +## Friendica contacts -Friendica contacts ---- Friendica will recreate your account on the new server, with your contacts and circles. A message is sent to Friendica contacts, to inform them about your move: If your contacts are running on an updated server, your details on their side will be automatically updated. -Diaspora contacts ---- +## Diaspora contacts + Newer Diaspora servers are able to process "account migration" messages. diff --git a/doc/en/user/quick-start/finally.md b/doc/en/user/quick-start/finally.md new file mode 100644 index 0000000000..8f06415552 --- /dev/null +++ b/doc/en/user/quick-start/finally.md @@ -0,0 +1,12 @@ +And that brings the Quick Start to an end. + +Here are some more things to help get you started: + +**Groups** + +- [Friendica Support](https://forum.friendi.ca/profile/helpers) - problems? This is the place to ask. + +**Documentation** + +- [Connections to other networks](help/user/connectors) +- [Help index](help) diff --git a/doc/Quick-Start-groupsandpages.md b/doc/en/user/quick-start/groups-and-pages.md similarity index 74% rename from doc/Quick-Start-groupsandpages.md rename to doc/en/user/quick-start/groups-and-pages.md index c9a27c6f1c..05ba28653b 100644 --- a/doc/Quick-Start-groupsandpages.md +++ b/doc/en/user/quick-start/groups-and-pages.md @@ -1,5 +1,5 @@ This is the global directory. -If you get lost, you can click this link to bring yourself back here. +If you get lost, you can [click this link](help/user/quick-start/groups-and-pages) to bring yourself back here. On this page, you'll find a collection of groups. Groups are not real people. @@ -13,8 +13,6 @@ Simply find a group you're interested in, and connect to it the same way you did There are a lot of groups, and you're likely to get lost. Remember the link at the top of this page will bring you back here. -Once you've added some groups, move on to the next section. - - - +Once you've added some groups, [move on to the next section](help/user/quick-start/finally). + diff --git a/doc/Quick-Start-guide.md b/doc/en/user/quick-start/guide.md similarity index 91% rename from doc/Quick-Start-guide.md rename to doc/en/user/quick-start/guide.md index ebcc6243f2..a357d3d862 100644 --- a/doc/Quick-Start-guide.md +++ b/doc/en/user/quick-start/guide.md @@ -18,8 +18,6 @@ Once you've finished writing your post, click on the padlock icon or permissions If you do not change anything, your post will be public. This means it will appear to anybody who views your profile, and in the community tab if your site has it enabled, as well as in the network tab of any of your contacts. -Play around with this a bit, then when you're ready to move on, we'll take a look at the Network Tab - - - +Play around with this a bit, then when you're ready to move on, we'll take a look at the [Network Tab](help/user/quick-start/network). + diff --git a/doc/Quick-Start-makingnewfriends.md b/doc/en/user/quick-start/making-new-friends.md similarity index 72% rename from doc/Quick-Start-makingnewfriends.md rename to doc/en/user/quick-start/making-new-friends.md index d642905698..d1f9b961a8 100644 --- a/doc/Quick-Start-makingnewfriends.md +++ b/doc/en/user/quick-start/making-new-friends.md @@ -1,5 +1,5 @@ This is your Suggested Friends page. -If you get lost, you can click this link to bring yourself back here. +If you get lost, you can [click this link](help/user/quick-start/making-new-friends) to bring yourself back here. This is a bit like the Friend Suggestions page of Facebook. Everybody on this list has agreed that they may be suggested as a friend. @@ -14,8 +14,6 @@ Now you've added one, you're probably lost. Click the link at the top of this page to go back to the suggested friends list and add some more. Feel uncomfortable adding people you don't know? -Don't worry - that's where Groups and Pages come in! - - - +Don't worry - that's where [Groups and Pages](help/user/quick-start/groups-and-pages) come in! + diff --git a/doc/Quick-Start-network.md b/doc/en/user/quick-start/network.md similarity index 62% rename from doc/Quick-Start-network.md rename to doc/en/user/quick-start/network.md index e0c138d2bd..bcabfcbaff 100644 --- a/doc/Quick-Start-network.md +++ b/doc/en/user/quick-start/network.md @@ -1,5 +1,5 @@ This is your Network Tab. -If you get lost, you can click this link to bring yourself back here. +If you get lost, you can [click this link](help/user/quick-start/network) to bring yourself back here. This is a bit like the Newsfeed at Facebook or the Stream at Diaspora. It's where all the posts from your contacts, groups, and feeds will appear. @@ -7,8 +7,6 @@ If you're new, you won't see anything in this page, unless you posted your statu If you've already added a few friends, you'll be able to see their posts. Here, you can comment, like, or dislike posts, or click on somebody's name to visit their profile page where you can write on their wall. -Now we need to fill it up, the first step, is to make some new friends. - - - +Now we need to fill it up, the first step, is to [make some new friends](help/user/quick-start/making-new-friends). + diff --git a/doc/Safety.md b/doc/en/user/safety.md similarity index 97% rename from doc/Safety.md rename to doc/en/user/safety.md index 4ecd927e87..9a8e6c7bcc 100644 --- a/doc/Safety.md +++ b/doc/en/user/safety.md @@ -1,15 +1,11 @@ -Safety -====== - -* [Home](help) +# Safety Each Friendica instance is linked together with a global network of other servers, some running Friendica and some running other software. These servers support a diverse global community of millions of users. Inevitably, some of these users are malicious. Friendica provides several features to keep you safe from abuse and harrassment. -Terms of Service ---- +## Terms of Service Each instance is entitled to define its own Terms of Service, also often called a Code of Conduct. These terms include rules for behaviour. @@ -21,8 +17,7 @@ Remember that conversations frequently involve participants from different insta Participants are only bound by the rules of the server where they have an account, not by the rules of your server. Terms of Service may even be completely incompatible. -Reporting ---- +## Reporting Your local administrators are responsible for ensuring a safe online environment for all users on your server. They rely on reports from users to highlight behaviour that puts other users at risk. @@ -32,8 +27,7 @@ You will be given an opportunity to select the type of problem you are seeing. Your local administrator then has the option of blocking that user for all users on your local instance. If a remote server is a constant source of abuse and their administrators are unable or unwilling to control their users behaviour, your administrator can even block the entire remote server. -Ignoring ---- +## Ignoring Once you have become friends, if you find the person constantly sends you spam or worthless information, you can "Ignore" them - without breaking off the friendship or even alerting them to the fact that you aren't interested in anything they are saying. In many ways they are like a "follower" - but they don't know this. @@ -45,8 +39,7 @@ Some servers are frequent sources of abusive or other unwanted behaviour. For this reason you can also choose to ignore entire servers. Users on that server can still follow you as normal. -Blocking ---- +## Blocking You can also "block" a person. This completely blocks communications with that person. @@ -66,8 +59,7 @@ In some cases this could lead to retaliation. There are several other ways someone can determine that you have blocked them, and see your public posts despite the block. For example, they can simply log out and view your posts. -Archiving ---- +## Archiving Archiving is similar to blocking. However, existing posts this person made before being archived will be visible in your stream. diff --git a/doc/Tags-and-Mentions.md b/doc/en/user/tags-and-mentions.md similarity index 95% rename from doc/Tags-and-Mentions.md rename to doc/en/user/tags-and-mentions.md index 8424b026cb..086950d88c 100644 --- a/doc/Tags-and-Mentions.md +++ b/doc/en/user/tags-and-mentions.md @@ -1,13 +1,8 @@ -Tags and Mentions -================= - - -* [Home](help) - +# Tags and mentions Like many other modern social networks, Friendica uses a special notation inside messages to indicate "tags" or contextual links to other entities. -**Mentions** +## Mentions People are tagged by preceding their name with the @ character. @@ -39,9 +34,9 @@ If you select a group from the ACL a !-mention will be added automatically to yo If you sort your contacts into circles, you cannot @-mention these circles. But you can select the circle in the access control when creating a new posting, to allow (or disallow) a certain circle of people to see the posting. -See [Circles and Privacy](help/Circles-and-Privacy) for more details about grouping your contacts. +See [Circles and privacy](help/user/circles-and-privacy) for more details about grouping your contacts. -**Topical Tags** +## Topical tags Topical tags are indicated by preceding the tag name with the # character. This will create a link in the post to a generalised site search for the term provided. diff --git a/doc/en/user/text-comment.md b/doc/en/user/text-comment.md new file mode 100644 index 0000000000..46e49a1efa --- /dev/null +++ b/doc/en/user/text-comment.md @@ -0,0 +1,29 @@ +# Comment, sort and delete posts + +Here you can find an overview of the different ways to comment and sort existing posts. Attention: we've used the "diabook" theme. If you're using another theme, some of the icons may be different. + +
+
+The different icons
+
+
This symbol is used to indicate that you like the post. Click it twice to undo your choice.
+
+
This symbol is used to indicate that you dislike the post. Click it twice to undo your choice.
+
+
+
This symbol is used to share a post. A copy of this post will automatically appear in your status editor and add a link to the original post.
+
+
+
This symbol is used to mark a post. Marked posts will appear on your network page at the "starred" tab (from "star"). Click it twice to undo your choice.
+
+
+
This symbol is used to tag a post with a self-chosen keyword. When you click at the word, you'll get a list of all posts with this tag. Attention: you can't delete the tag once you've set one.
+
+
+
This symbol is used to categorize posts. Choose an existing folder or create a new one. You'll find the created folder on your network page under the "saved folders" tab.
+
+
+
This symbol is used to delete your own post or to remove a post of another person from your stream.
+
+
+
This symbol is used to choose more than one post to delete in a single step. After selecting all posts, go to the end of the page and click "Delete Selected Items".
diff --git a/doc/Text_editor.md b/doc/en/user/text-editor.md
similarity index 51%
rename from doc/Text_editor.md
rename to doc/en/user/text-editor.md
index c20b9ac649..25b40a1295 100644
--- a/doc/Text_editor.md
+++ b/doc/en/user/text-editor.md
@@ -4,10 +4,7 @@ figure img { padding: 2px; }
figure figcaption { background: #eeeeee; color: #444444; padding: 2px; font-style: italic;}
-Creating posts
-===========
-
-* [Home](help)
+# Creating posts
Here you can find an overview of the different ways to create and edit your post.
@@ -15,12 +12,12 @@ One click on the Pencil & Paper icon in the top right of your Home or Network pa
Below are examples of the post editor in 3 of Friendica's common themes:
+
+
Upload a picture from your computer. The image will be uploaded and correct bbcode tag will be added to your post.* In the Frio theme, use the Browser tab instead to Upload and/or attach content to your post.
+ Upload a picture from your computer. The image will be uploaded and correct bbcode tag will be added to your post.* In the Frio theme, use the Browser tab instead to Upload and/or attach content to your post.
-
This depends on the theme: For Frio, this is to attach remote content - put in a URL to embed in your post, including video or audio content. For other themes: Add files from your computer. Same as picture, but for generic attachment to the post.*
+ This depends on the theme: For Frio, this is to attach remote content - put in a URL to embed in your post, including video or audio content. For other themes: Add files from your computer. Same as picture, but for generic attachment to the post.*
-
Add a web address (url). Enter a URL and Friendica will add to your post a link to the url and an excerpt from the web site, if possible.
+ Add a web address (url). Enter a URL and Friendica will add to your post a link to the url and an excerpt from the web site, if possible.
-
Add a video. Enter the url to a video (ogg) or to a video page on youtube or vimeo, and it will be embedded in your post with a preview. (In the Frio theme, this is done with the paperclip as mentioned above.) Friendica is using [HTML5](http://en.wikipedia.org/wiki/HTML5_video) for embedding content. Therefore, the supported files are depending on your browser and operating system (OS). Some filetypes are WebM, MP4 and OGG.*
+ Add a video. Enter the url to a video (ogg) or to a video page on youtube or vimeo, and it will be embedded in your post with a preview. (In the Frio theme, this is done with the paperclip as mentioned above.) Friendica is using [HTML5](http://en.wikipedia.org/wiki/HTML5_video) for embedding content. Therefore, the supported files are depending on your browser and operating system (OS). Some filetypes are WebM, MP4 and OGG.*
-
Add an audio. Same as video, but for audio. Depending on your browser and operation system MP3, OGG and AAC are supported. Additionally, you are able to add URLs from audiohosters like Soundcloud.
+ Add an audio. Same as video, but for audio. Depending on your browser and operation system MP3, OGG and AAC are supported. Additionally, you are able to add URLs from audiohosters like Soundcloud.
-
Or 
Set your geographic location. This location will be added into a Google Maps search. That's why a note like "New York" or "10004" is already enough.
+ Or 
Set your geographic location. This location will be added into a Google Maps search. That's why a note like "New York" or "10004" is already enough.
@@ -66,21 +63,21 @@ These icons can change depending on the theme. Some examples:
| Vier: | - |
+  |
-**
The Lock / Permissions**
+**
The Lock / Permissions**
In Frio, the Permissions tab, or in other themes, the Lock button, is the most important feature in Friendica. If the lock is open, your post will be public, and will show up on your profile page when strangers visit it.
Click on it and the *Permission settings* window (aka "*Access Control Selector*" or "*ACL Selector*") pops up. There you can select who can see the post.
+
', $data['type']);
}
- if ($embed && (($data['player_url'] != '' && $data['player_height'] != 0) || $data['embed_html'] != '')) {
+ if ($embed) {
$media = DI::postMediaFactory()->createFromAttachment($data, $uriid);
- if ($data['player_url'] != '' && $data['player_height'] != 0) {
- $return .= DI::postMediaRepository()->getPlayerIframe($media);
+ if ($media->hasPlayerUrl() && $media->hasPlayerHeight()) {
+ $embed_media = DI::postMediaRepository()->getPlayerIframe($media);
+ } elseif ($media->hasEmbedHtml() && !$media->isPhoto()) {
+ $embed_media = DI::postMediaRepository()->getEmbedIframe($media);
} else {
- $return .= DI::postMediaRepository()->getEmbedIframe($media);
+ $embed_media = null;
+ }
+
+ if ($embed_media) {
+ $return .= $embed_media;
+
+ $preview_mode = self::PREVIEW_NO_IMAGE;
+ unset($data['title']);
+ unset($data['url']);
+ unset($data['description']);
+ unset($data['provider_url']);
+ unset($data['provider_name']);
}
- $preview_mode = self::PREVIEW_NO_IMAGE;
- unset($data['title']);
- unset($data['url']);
- unset($data['description']);
- unset($data['provider_url']);
- unset($data['provider_name']);
}
if ($preview_mode == self::PREVIEW_NO_IMAGE) {
@@ -464,7 +472,7 @@ class BBCode
}
if (!empty($data['title']) && !empty($data['url'])) {
- $preview_class = $preview_mode == self::PREVIEW_LARGE ? 'attachment-image' : 'attachment-preview';
+ $preview_class = in_array($preview_mode, [self::PREVIEW_AUTO, self::PREVIEW_LARGE]) ? 'attachment-image' : 'attachment-preview';
if (!empty($data['image']) && empty($data['text']) && ($data['type'] == 'photo')) {
$return .= sprintf('
', $data['url'], self::proxyUrl($data['image'], $simplehtml, $uriid), $data['title']);
} else {
diff --git a/src/Content/Text/HTML.php b/src/Content/Text/HTML.php
index c8afc8ce28..3d789e7fa0 100644
--- a/src/Content/Text/HTML.php
+++ b/src/Content/Text/HTML.php
@@ -1067,4 +1067,38 @@ class HTML
{
return ($text != html_entity_decode($text)) || ($text != strip_tags($text));
}
+
+ /**
+ * Remove HTML elements with a specific class name
+ *
+ * @param string $html
+ * @param string $className
+ * @return string the HTML without the removed HTML element
+ */
+ public static function removeElementByClass(string $html, string $className): string
+ {
+ $dom = new DOMDocument();
+ libxml_use_internal_errors(true);
+
+ $dom->loadHTML(mb_convert_encoding('' . $html . '', 'HTML-ENTITIES', "UTF-8"), LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD);
+ libxml_clear_errors();
+
+ $xpath = new DOMXPath($dom);
+
+ $nodes = $xpath->query("//*[contains(@class, '" . $className . "')]");
+ if (!$nodes || $nodes->length == 0) {
+ return $html;
+ }
+
+ foreach ($nodes as $node) {
+ $node->parentNode->removeChild($node);
+ }
+
+ $html = trim($dom->saveHTML());
+ if (substr($html, 0, 6) == '' && substr($html, -7) == '') {
+ $html = substr($html, 6, -7);
+ }
+
+ return $html;
+ }
}
diff --git a/src/Content/Widget.php b/src/Content/Widget.php
index c983a51f59..6adb8c24b7 100644
--- a/src/Content/Widget.php
+++ b/src/Content/Widget.php
@@ -608,6 +608,19 @@ class Widget
}
}
+ $widget_timelineorder = json_decode(DI::pConfig()->get($uid, 'system', 'widget_timeline_order'));
+ if (!empty($widget_timelineorder)) {
+ $tmp = [];
+ foreach($widget_timelineorder as $order) {
+ foreach($channels as $channel) {
+ if($channel['ref'] == $order) {
+ $tmp[] = $channel;
+ }
+ }
+ }
+ $channels = $tmp;
+ }
+
return self::filter(
'channel',
DI::l10n()->t('Channels'),
diff --git a/src/Core/Console.php b/src/Core/Console.php
index 5dec5be257..ac639fe199 100644
--- a/src/Core/Console.php
+++ b/src/Core/Console.php
@@ -41,36 +41,42 @@ class Console extends \Asika\SimpleConsole\Console
Usage: bin/console [--version] [-h|--help|-?] [] [-v]
Commands:
- addon Addon management
- cache Manage node cache
- clearavatarcache Clear the file based avatar cache
- config Edit site config
- contact Contact management
- createdoxygen Generate Doxygen headers
daemon Interact with the Friendica daemon
+ help Show help about a command, e.g (bin/console help config)
jetstream Interact with the Jetstream daemon
worker Start worker process
- dbstructure Do database updates
- docbloxerrorchecker Check the file tree for DocBlox errors
- extract Generate translation string file for the Friendica project (deprecated)
- globalcommunityblock Block remote profile from interacting with this node
- globalcommunitysilence Silence a profile from the global community page
- archivecontact Archive a contact when you know that it isn't existing anymore
- help Show help about a command, e.g (bin/console help config)
- autoinstall Starts automatic installation of friendica based on values from htconfig.php
- lock Edit site locks
- maintenance Set maintenance mode for this node
- movetoavatarcache Move cached avatars to the file based avatar cache
- mergecontacts Merge duplicated contact entries
- user User management
- php2po Generate a messages.po file from a strings.php file
- po2php Generate a strings.php file from a messages.po file
- typo Checks for parse errors in Friendica files
- postupdate Execute pending post update scripts (can last days)
- relocate Update node base URL
- serverblock Manage blocked servers
- storage Manage storage backend
- relay Manage ActivityPub relay servers
+
+ node management
+ archivecontact Archive a contact when you know that it isn't existing anymore
+ cache Manage node cache
+ contact Contact management
+ globalcommunityblock Block remote profile from interacting with this node
+ globalcommunitysilence Silence a profile from the global community page
+ lock Edit site locks
+ mergecontacts Merge duplicated contact entries
+ serverblock Manage blocked servers
+ relay Manage ActivityPub relay servers
+ user User management
+
+ node configuration
+ addon Addon management
+ autoinstall Starts automatic installation of friendica based on values from htconfig.php
+ clearavatarcache Clear the file based avatar cache
+ config Edit site config
+ dbstructure Do database updates
+ maintenance Set maintenance mode for this node
+ movetoavatarcache Move cached avatars to the file based avatar cache
+ postupdate Execute pending post update scripts (can last days)
+ relocate Update node base URL
+ storage Manage storage backend
+
+ developer
+ createdoxygen Generate Doxygen headers
+ docbloxerrorchecker Check the file tree for DocBlox errors
+ extract Generate translation string file for the Friendica project (deprecated)
+ php2po Generate a messages.po file from a strings.php file
+ po2php Generate a strings.php file from a messages.po file
+ typo Checks for parse errors in Friendica files
Options:
-h|--help|-? Show help information
diff --git a/src/Core/Logger/Util/Introspection.php b/src/Core/Logger/Util/Introspection.php
index 0856a59e9c..925031851b 100644
--- a/src/Core/Logger/Util/Introspection.php
+++ b/src/Core/Logger/Util/Introspection.php
@@ -73,7 +73,7 @@ class Introspection implements IHaveCallIntrospections
'line' => $trace[$i - 1]['line'] ?? null,
'function' => $trace[$i]['function'] ?? null,
'request-id' => $this->requestId,
- 'stack' => System::callstack(15, 0, true, ['Friendica\Core\Logger\Type\StreamLogger', 'Friendica\Core\Logger\Type\AbstractLogger', 'Friendica\Core\Logger\Type\WorkerLogger', 'Friendica\Core\Logger']),
+ 'stack' => System::callstack(15, 1, ['Friendica\Core\Logger\Type\StreamLogger', 'Friendica\Core\Logger\Type\AbstractLogger', 'Friendica\Core\Logger\Type\WorkerLogger', 'Friendica\Core\Logger']),
];
}
diff --git a/src/Core/System.php b/src/Core/System.php
index d7367e871c..dc6d0a068f 100644
--- a/src/Core/System.php
+++ b/src/Core/System.php
@@ -212,25 +212,54 @@ class System
$this->logger->info('Executed "proc_open"', ['command' => $cmdline]);
}
+ /**
+ * Get the callstack without the database operations
+ *
+ * @return array the callstack
+ */
+ public static function getCallstack(): array
+ {
+ $backtrace = [];
+ $file = '';
+ $line = 0;
+ foreach (debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS) as $trace) {
+ if (!isset($trace['file']) || !isset($trace['function']) || !isset($trace['line'])) {
+ continue;
+ }
+ if (in_array(basename($trace['file']), ['DBA.php', 'Database.php'])) {
+ continue;
+ }
+ if (in_array(basename($trace['function']), ['selectView', 'selectPosts', 'selectFirstPost', 'fetch', 'toArray', 'exists', 'count', 'selectFirst', 'selectToArray', 'select', 'selectFirstForUser', 'selectForUser'])) {
+ continue;
+ }
+ if ($line != 0) {
+ $new = $trace;
+ $new['file'] = $file;
+ $new['line'] = $line;
+ $backtrace[] = $new;
+ }
+ $file = $trace['file'];
+ $line = $trace['line'];
+ }
+
+ return $backtrace;
+ }
+
/**
* Returns a string with a callstack. Can be used for logging.
*
* @param integer $depth How many calls to include in the stacks after filtering
* @param int $offset How many calls to shave off the top of the stack, for example if
* this is called from a centralized method that isn't relevant to the callstack
- * @param bool $full If enabled, the callstack is not compacted
* @param array $exclude
* @return string
*/
- public static function callstack(int $depth = 4, int $offset = 0, bool $full = false, array $exclude = []): string
+ public static function callstack(int $depth = 4, int $offset = 0, array $exclude = []): string
{
- $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-
- // We remove at least the first two items from the list since they contain data that we don't need.
- $trace = array_slice($trace, 2 + $offset);
+ // We remove at least the first item from the list since they contain data that we don't need.
+ $trace = array_slice(self::getCallstack(), 1 + $offset);
$callstack = [];
- $previous = ['class' => '', 'function' => '', 'database' => false];
// The ignore list contains all functions that are only wrapper functions
$ignore = ['call_user_func_array'];
@@ -240,25 +269,12 @@ class System
if (in_array($func['class'], $exclude)) {
continue;
}
-
- if (!$full && in_array($previous['function'], ['insert', 'fetch', 'toArray', 'exists', 'count', 'selectFirst', 'selectToArray',
- 'select', 'update', 'delete', 'selectFirstForUser', 'selectForUser'])
- && (substr($previous['class'], 0, 15) === 'Friendica\Model')) {
- continue;
- }
-
- // Don't show multiple calls from the Database classes to show the essential parts of the callstack
- $func['database'] = in_array($func['class'], ['Friendica\Database\DBA', 'Friendica\Database\Database']);
- if ($full || !$previous['database'] || !$func['database']) {
- $classparts = explode("\\", $func['class']);
- $callstack[] = array_pop($classparts).'::'.$func['function'] . (isset($func['line']) ? ' (' . $func['line'] . ')' : '');
- $previous = $func;
- }
+ $classparts = explode("\\", $func['class']);
+ $callstack[] = array_pop($classparts).'::'.$func['function'] . (isset($func['line']) ? ' (' . $func['line'] . ')' : '');
} elseif (!in_array($func['function'], $ignore)) {
$func['database'] = ($func['function'] == 'q');
$callstack[] = $func['function'] . (isset($func['line']) ? ' (' . $func['line'] . ')' : '');
$func['class'] = '';
- $previous = $func;
}
}
diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index 6a5ac37b9a..1574cadbf5 100644
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -1493,4 +1493,14 @@ class Worker
return $execute;
}
+
+ /**
+ * Check if we are in worker mode
+ *
+ * @return boolean
+ */
+ public static function isInWorkerMode(): bool
+ {
+ return (DI::logger() instanceof WorkerLogger);
+ }
}
diff --git a/src/Database/Database.php b/src/Database/Database.php
index c037a3198b..82522a100a 100644
--- a/src/Database/Database.php
+++ b/src/Database/Database.php
@@ -723,13 +723,13 @@ class Database
if (($duration > $this->config->get('system', 'db_loglimit'))) {
$duration = round($duration, 3);
- $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+ $backtrace = System::getCallstack();
@file_put_contents(
$this->config->get('system', 'db_log'),
DateTimeFormat::utcNow() . "\t" . $duration . "\t" .
- basename($backtrace[1]['file']) . "\t" .
- $backtrace[1]['line'] . "\t" . $backtrace[2]['function'] . "\t" .
+ basename($backtrace[0]['file']) . "\t" .
+ $backtrace[0]['line'] . "\t" . $backtrace[0]['function'] . "\t" .
substr($this->replaceParameters($sql, $args), 0, 4000) . "\n",
FILE_APPEND
);
diff --git a/src/Model/APContact.php b/src/Model/APContact.php
index 8ecc3ed8af..eb8a3bef8d 100644
--- a/src/Model/APContact.php
+++ b/src/Model/APContact.php
@@ -68,7 +68,7 @@ class APContact
if (!empty($link['template']) && ($link['rel'] == ActivityNamespace::OSTATUSSUB)) {
$data['subscribe'] = $link['template'];
- } elseif (!empty($link['href']) && !empty($link['type']) && ($link['rel'] == 'self') && ($link['type'] == 'application/activity+json')) {
+ } elseif (!empty($link['href']) && !empty($link['type']) && ($link['rel'] == 'self') && in_array($link['type'], ['application/activity+json', 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'])) {
$data['url'] = $link['href'];
} elseif (!empty($link['href']) && !empty($link['type']) && ($link['rel'] == ActivityNamespace::WEBFINGERPROFILE) && ($link['type'] == 'text/html')) {
$data['alias'] = $link['href'];
@@ -260,9 +260,21 @@ class APContact
if (is_array($apcontact['photo']) || !empty($compacted['as:icon']['as:url']['@id'])) {
$apcontact['photo'] = JsonLD::fetchElement($compacted['as:icon'], 'as:url', '@id');
} elseif (empty($apcontact['photo'])) {
- $photo = JsonLD::fetchElementArray($compacted, 'as:icon', 'as:url');
- if (!empty($photo[0]['@id'])) {
- $apcontact['photo'] = $photo[0]['@id'];
+ $prevwidth = 0;
+ $prevheight = 0;
+ $photo = JsonLD::fetchElementArray($compacted, 'as:icon', 'as:url');
+ $heights = JsonLD::fetchElementArray($compacted, 'as:icon', 'as:height');
+ $widths = JsonLD::fetchElementArray($compacted, 'as:icon', 'as:width');
+ if (is_array($photo) && is_array($heights) && is_array($widths)) {
+ foreach ($photo as $key => $url) {
+ $height = $heights[$key]['@value'] ?? 0;
+ $width = $widths[$key]['@value'] ?? 0;
+ if (($width >= $prevwidth) || ($height >= $prevheight)) {
+ $apcontact['photo'] = $url['@id'];
+ }
+ $prevwidth = $width;
+ $prevheight = $height;
+ }
}
}
diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index b2f9e2bd63..a5afd3c21d 100644
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -251,7 +251,7 @@ class Contact
Contact\User::insertForContactArray($contact);
if ((empty($contact['baseurl']) || empty($contact['gsid'])) && Probe::isProbable($contact['network'])) {
- DI::logger()->debug('Update missing baseurl', ['id' => $contact['id'], 'url' => $contact['url'], 'callstack' => System::callstack(4, 0, true)]);
+ DI::logger()->debug('Update missing baseurl', ['id' => $contact['id'], 'url' => $contact['url'], 'callstack' => System::callstack(4, 0)]);
UpdateContact::add(['priority' => Worker::PRIORITY_MEDIUM, 'dont_fork' => true], $contact['id']);
}
@@ -1367,7 +1367,7 @@ class Contact
* @throws InternalServerErrorException
* @throws \ImagickException
*/
- public static function getIdForURL(string $url = null, int $uid = 0, $update = null, array $default = []): int
+ public static function getIdForURL(?string $url = null, int $uid = 0, $update = null, array $default = []): int
{
$contact_id = 0;
@@ -1629,7 +1629,7 @@ class Contact
* @return string posts in HTML
* @throws Exception
*/
- public static function getPostsFromUrl(string $contact_url, int $uid, bool $only_media = false, string $last_created = null): string
+ public static function getPostsFromUrl(string $contact_url, int $uid, bool $only_media = false, ?string $last_created = null): string
{
return self::getPostsFromId(self::getIdForURL($contact_url), $uid, $only_media, $last_created);
}
@@ -1644,7 +1644,7 @@ class Contact
* @return string posts in HTML
* @throws Exception
*/
- public static function getPostsFromId(int $cid, int $uid, bool $only_media = false, string $last_created = null): string
+ public static function getPostsFromId(int $cid, int $uid, bool $only_media = false, ?string $last_created = null): string
{
$contact = DBA::selectFirst('contact', ['contact-type', 'network', 'name', 'nick'], ['id' => $cid]);
if (!DBA::isResult($contact)) {
@@ -1671,7 +1671,7 @@ class Contact
if ($only_media) {
$condition = DBA::mergeConditions($condition, [
- "`uri-id` IN (SELECT `uri-id` FROM `post-media` WHERE `type` IN (?, ?, ?))",
+ "`uri-id` IN (SELECT `uri-id` FROM `post-media` WHERE `type` IN (?, ?, ?, ?))",
Post\Media::AUDIO, Post\Media::IMAGE, Post\Media::VIDEO, Post\Media::HLS
]);
}
@@ -1834,7 +1834,7 @@ class Contact
* @param string $reason Block reason
* @return bool Whether it was successful
*/
- public static function block(int $cid, string $reason = null): bool
+ public static function block(int $cid, ?string $reason = null): bool
{
$return = self::update(['blocked' => true, 'block_reason' => $reason], ['id' => $cid]);
@@ -3753,10 +3753,11 @@ class Contact
*/
public static function canReceivePrivateMessages(array $contact): bool
{
- $protocol = $contact['network'] ?? $contact['protocol'] ?? Protocol::PHANTOM;
- $self = $contact['self'] ?? false;
+ $protocol = $contact['network'] ?? $contact['protocol'] ?? Protocol::PHANTOM;
+ $self = $contact['self'] ?? false;
+ $type = $contact['contact-type'] ?? Contact::TYPE_UNKNOWN;
- return in_array($protocol, [Protocol::DFRN, Protocol::DIASPORA, Protocol::ACTIVITYPUB]) && !$self;
+ return in_array($protocol, [Protocol::DFRN, Protocol::DIASPORA, Protocol::ACTIVITYPUB]) && !$self && ($type != Contact::TYPE_COMMUNITY);
}
/**
diff --git a/src/Model/Event.php b/src/Model/Event.php
index 11fe8a9b4b..730d6082a3 100644
--- a/src/Model/Event.php
+++ b/src/Model/Event.php
@@ -886,6 +886,7 @@ class Event
$dformat = DI::l10n()->t('l F d, Y \@ g:i A'); // Friday January 18, 2011 @ 8:01 AM.
$dformat_short = DI::l10n()->t('D g:i A'); // Fri 8:01 AM.
$tformat = DI::l10n()->t('g:i A'); // 8:01 AM.
+ $tzformat = DI::l10n()->t('e'); // Atlantic/Azores.
// Convert the time to different formats.
$dtstart_dt = DI::l10n()->getDay(DateTimeFormat::local($item['event-start'], $dformat));
@@ -896,6 +897,7 @@ class Event
$date_short = DateTimeFormat::local($item['event-start'], 'j');
$start_time = DateTimeFormat::local($item['event-start'], $tformat);
$start_short = DI::l10n()->getDayShort(DateTimeFormat::local($item['event-start'], $dformat_short));
+ $timezone = DateTimeFormat::local($item['event-start'], $tzformat);
// If the option 'nofinisch' isn't set, we need to format the finish date/time.
if (!$item['event-nofinish']) {
@@ -943,6 +945,7 @@ class Event
'$start_short' => $start_short,
'$end_time' => $end_time,
'$end_short' => $end_short,
+ '$timezone' => $timezone,
'$author_name' => $item['author-name'],
'$author_link' => $profile_link,
'$author_avatar' => $item['author-avatar'],
diff --git a/src/Model/Item.php b/src/Model/Item.php
index 72334e4183..fa7c9eed45 100644
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -29,6 +29,7 @@ use Friendica\Network\HTTPException\InternalServerErrorException;
use Friendica\Network\HTTPException\ServiceUnavailableException;
use Friendica\Protocol\Activity;
use Friendica\Protocol\ActivityPub;
+use Friendica\Protocol\ActivityPub\Processor;
use Friendica\Protocol\Delivery;
use Friendica\Protocol\Diaspora;
use Friendica\Util\DateTimeFormat;
@@ -39,7 +40,6 @@ use Friendica\Util\Proxy;
use Friendica\Util\Strings;
use Friendica\Util\Temporal;
use GuzzleHttp\Psr7\Uri;
-use LanguageDetection\Language;
class Item
{
@@ -158,6 +158,7 @@ class Item
const CANT_REPLY = 1;
const CANT_LIKE = 2;
const CANT_ANNOUNCE = 4;
+ const CANT_QUOTE = 8;
/**
* Update existing item entries
@@ -995,6 +996,10 @@ class Item
return 0;
}
+ if (!isset($item['restrictions']) || is_null($item['restrictions'])) {
+ $item['restrictions'] = Processor::getRestrictions($item['uri-id'], $item['author-id'], $item['uid']);
+ }
+
$post_user_id = Post\User::insert($item['uri-id'], $item['uid'], $item);
if (!$post_user_id) {
DI::logger()->notice('Post-User is already inserted - aborting', ['uid' => $item['uid'], 'uri-id' => $item['uri-id']]);
@@ -1313,14 +1318,16 @@ class Item
return;
}
- $languages = $item['language'] ? array_keys(json_decode($item['language'], true)) : [];
+ $languages = $item['language'] ? json_decode($item['language'], true) : [];
+ $quality = DI::config()->get('system', 'relay_language_quality');
foreach (Tag::getUIDListByURIId($item['uri-id']) as $uid => $tags) {
if (!empty($languages)) {
$keep = false;
$user_languages = User::getWantedLanguages($uid);
foreach ($user_languages as $language) {
- if (in_array($language, $languages)) {
+ if (in_array($language, array_keys($languages)) && $languages[$language] > $quality) {
+ DI::logger()->debug('Wanted language found', ['uid' => $uid, 'language' => $language, 'quality' => $languages[$language], 'limit' => $quality]);
$keep = true;
}
}
@@ -1830,7 +1837,7 @@ class Item
* @return string Unique guid
* @throws \Exception
*/
- public static function guidFromUri(string $uri, string $host = null): string
+ public static function guidFromUri(string $uri, ?string $host = null): string
{
// Our regular guid routine is using this kind of prefix as well
// We have to avoid that different routines could accidentally create the same value
@@ -2232,7 +2239,7 @@ class Item
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- public static function fixPrivatePhotos(string $s, int $uid, array $item = null, int $cid = 0): string
+ public static function fixPrivatePhotos(string $s, int $uid, ?array $item = null, int $cid = 0): string
{
if (DI::config()->get('system', 'disable_embedded')) {
return $s;
@@ -2498,7 +2505,7 @@ class Item
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- public static function performActivity(int $item_id, string $verb, int $uid, string $allow_cid = null, string $allow_gid = null, string $deny_cid = null, string $deny_gid = null): bool
+ public static function performActivity(int $item_id, string $verb, int $uid, ?string $allow_cid = null, ?string $allow_gid = null, ?string $deny_cid = null, ?string $deny_gid = null): bool
{
if (empty($uid)) {
return false;
@@ -2953,14 +2960,14 @@ class Item
if (!empty($shared_item['uri-id'])) {
$shared_uri_id = $shared_item['uri-id'];
$shared_links[] = strtolower($shared_item['plink']);
- $sharedSplitAttachments = DI::postMediaRepository()->splitAttachments($shared_uri_id, [], $shared_item['has-media']);
+ $sharedSplitAttachments = DI::postMediaRepository()->splitAttachments($shared_uri_id, [], $shared_item['has-media'], $uid != 0);
$shared_links = array_merge($shared_links, $sharedSplitAttachments['visual']->column('url'));
$shared_links = array_merge($shared_links, $sharedSplitAttachments['link']->column('url'));
$shared_links = array_merge($shared_links, $sharedSplitAttachments['additional']->column('url'));
$item['body'] = self::replaceVisualAttachments($sharedSplitAttachments['visual'], $item['body']);
}
- $itemSplitAttachments = DI::postMediaRepository()->splitAttachments($item['uri-id'], $shared_links, $item['has-media'] ?? false);
+ $itemSplitAttachments = DI::postMediaRepository()->splitAttachments($item['uri-id'], $shared_links, $item['has-media'] ?? false, $uid != 0);
$item['body'] = self::replaceVisualAttachments($itemSplitAttachments['visual'], $item['body'] ?? '');
self::putInCache($item);
@@ -3034,8 +3041,9 @@ class Item
if (!empty($sharedSplitAttachments)) {
$s = self::addGallery($s, $sharedSplitAttachments['visual']);
$s = self::addVisualAttachments($sharedSplitAttachments['visual'], $shared_item, $s, true, $uid);
- $s = self::addLinkAttachment($shared_uri_id ?: $item['uri-id'], $sharedSplitAttachments, $body, $s, true, $quote_shared_links, $uid);
+ $s = self::addLinkAttachment($shared_uri_id ?: $item['uri-id'], $sharedSplitAttachments, $body, $s, true, $quote_shared_links, $uid, $shared_item);
$s = self::addNonVisualAttachments($sharedSplitAttachments['additional'], $item, $s);
+ $s = self::addHiddenAttachments($sharedSplitAttachments['hidden'], $item, $s);
$body = BBCode::removeSharedData($body);
}
@@ -3047,8 +3055,9 @@ class Item
$s = self::addGallery($s, $itemSplitAttachments['visual']);
$s = self::addVisualAttachments($itemSplitAttachments['visual'], $item, $s, false, $uid);
- $s = self::addLinkAttachment($item['uri-id'], $itemSplitAttachments, $body, $s, false, $shared_links, $uid);
+ $s = self::addLinkAttachment($item['uri-id'], $itemSplitAttachments, $body, $s, false, $shared_links, $uid, $item);
$s = self::addNonVisualAttachments($itemSplitAttachments['additional'], $item, $s);
+ $s = self::addHiddenAttachments($itemSplitAttachments['hidden'], $item, $s);
$s = self::addQuestions($item, $s);
// Map.
@@ -3069,7 +3078,7 @@ class Item
$s .= $shared_html;
}
- $s = DI::postMediaRepository()->addEmbed($s, $uid, $item['uri-id']);
+ $s = DI::postMediaRepository()->addEmbed($s, $uid, $item['uri-id'], $uid != 0);
$s = HTML::applyContentFilter($s, $filter_reasons);
@@ -3131,6 +3140,7 @@ class Item
*/
private static function addGallery(string $s, PostMedias $PostMedias): string
{
+ /** @var PostMedia $PostMedia */
foreach ($PostMedias as $PostMedia) {
if (!$PostMedia->preview || ($PostMedia->type !== Post\Media::IMAGE)) {
continue;
@@ -3235,6 +3245,7 @@ class Item
{
DI::profiler()->startRecording('rendering');
+ /** @var PostMedia $PostMedia */
foreach ($PostMedias as $PostMedia) {
if ($PostMedia->preview) {
if (DI::baseUrl()->isLocalUri($PostMedia->preview)) {
@@ -3279,6 +3290,7 @@ class Item
$images = new PostMedias();
// @todo In the future we should make a single for the template engine with all media in it. This allows more flexibilty.
+ /** @var PostMedia $PostMedia */
foreach ($PostMedias as $PostMedia) {
if (self::containsLink($item['body'], $PostMedia->preview ?? $PostMedia->url, $PostMedia->type) || self::containsEmbed($item['body'], $PostMedia->url)) {
continue;
@@ -3359,19 +3371,24 @@ class Item
* @param bool $shared
* @param array $ignore_links A list of URLs to ignore
* @param int $uid
+ * @param array $item
* @return string modified content
* @throws InternalServerErrorException
* @throws ServiceUnavailableException
*/
- private static function addLinkAttachment(int $uriid, array $attachments, string $body, string $content, bool $shared, array $ignore_links, int $uid): string
+ private static function addLinkAttachment(int $uriid, array $attachments, string $body, string $content, bool $shared, array $ignore_links, int $uid, array $item): string
{
DI::profiler()->startRecording('rendering');
// Don't show a preview when there is a visual attachment (audio or video)
- $types = $attachments['visual']->column('type');
- $preview = !in_array(PostMedia::TYPE_IMAGE, $types) && !in_array(PostMedia::TYPE_VIDEO, $types);
+ $types = $attachments['visual']->column('type');
+ $preview = !in_array(PostMedia::TYPE_IMAGE, $types) && !in_array(PostMedia::TYPE_VIDEO, $types);
+ $has_media = in_array($item['post-type'] ?? null, [Item::PT_AUDIO, Item::PT_VIDEO]);
+ $is_article = false;
/** @var ?PostMedia $attachment */
$attachment = null;
+
+ /** @var PostMedia $PostMedia */
foreach ($attachments['link'] as $PostMedia) {
$found = false;
foreach ($ignore_links as $ignore_link) {
@@ -3409,7 +3426,9 @@ class Item
'embed_html' => $attachment->embedHtml,
'embed_width' => $attachment->embedWidth,
'embed_height' => $attachment->embedHeight,
+ 'page_type' => $attachment->pageType,
];
+ $is_article = $attachment->isArticle();
if ($preview && $attachment->preview) {
if ($attachment->previewWidth >= 500) {
@@ -3459,8 +3478,13 @@ class Item
}
// @todo Use a template
- $preview_mode = DI::pConfig()->get($uid, 'system', 'preview_mode', BBCode::PREVIEW_LARGE);
- if ($preview_mode != BBCode::PREVIEW_NONE && !self::containsEmbed($body, $data['url'])) {
+ $preview_mode = DI::pConfig()->get($uid, 'system', 'preview_mode', BBCode::PREVIEW_AUTO);
+ if ($uid == 0) {
+ $preview_mode = BBCode::PREVIEW_NO_IMAGE;
+ } elseif ($preview_mode == BBCode::PREVIEW_AUTO) {
+ $preview_mode = $is_article ? BBCode::PREVIEW_SMALL : BBCode::PREVIEW_LARGE;
+ }
+ if (!$has_media && $preview_mode != BBCode::PREVIEW_NONE && !self::containsEmbed($body, $data['url'])) {
$rendered = BBCode::convertAttachment('', BBCode::INTERNAL, $data, $uriid, $preview_mode, DI::pConfig()->get($uid, 'system', 'embed_remote_media', false));
} elseif (!self::containsLink($content, $data['url'], Post\Media::HTML)) {
$rendered = Renderer::replaceMacros(Renderer::getMarkupTemplate('content/link.tpl'), [
@@ -3502,6 +3526,7 @@ class Item
{
DI::profiler()->startRecording('rendering');
$trailing = '';
+ /** @var PostMedia $PostMedia */
foreach ($PostMedias as $PostMedia) {
if (strpos($item['body'], (string)$PostMedia->url)) {
continue;
@@ -3535,6 +3560,36 @@ class Item
return $content;
}
+ /**
+ * Add hidden attachments message to the content
+ *
+ * @param PostMedias $PostMedias
+ * @param array $item
+ * @param string $content
+ * @return string modified content
+ */
+ private static function addHiddenAttachments(PostMedias $PostMedias, array $item, string $content): string
+ {
+ if (count($PostMedias) == 0) {
+ return $content;
+ }
+
+
+ $plink = self::getPlink($item);
+
+ if (isset($plink['href']) && !DI::baseUrl()->isLocalUrl($plink['href'])) {
+ $message = DI::l10n()->t('The media in this post is not displayed to visitors. To view it, please go to the original post.', $plink['href']);
+ } else {
+ $message = DI::l10n()->t('The media in this post is not displayed to visitors. To view it, please log in.');
+ }
+
+ $media = Renderer::replaceMacros(Renderer::getMarkupTemplate('content/hidden.tpl'), [
+ 'message' => $message,
+ ]);
+
+ return $media . $content;
+ }
+
private static function addQuestions(array $item, string $content): string
{
DI::profiler()->startRecording('rendering');
@@ -3591,7 +3646,7 @@ class Item
$plink = $item['uri'];
}
- if (($item['post-reason'] == self::PR_ANNOUNCEMENT) && ($item['owner-contact-type'] == Contact::TYPE_COMMUNITY) && ($item['owner-network'] == Protocol::DFRN)) {
+ if (($item['owner-contact-type'] == Contact::TYPE_COMMUNITY) && ($item['owner-network'] == Protocol::DFRN)) {
$contact = Contact::getById($item['owner-id'], ['baseurl']);
if (!empty($contact['baseurl'])) {
$plink = $contact['baseurl'] . '/display/' . $item['guid'];
diff --git a/src/Model/ItemHelper.php b/src/Model/ItemHelper.php
index 686549b4f9..4b348e4964 100644
--- a/src/Model/ItemHelper.php
+++ b/src/Model/ItemHelper.php
@@ -389,6 +389,10 @@ final class ItemHelper
return true;
}
+ if (($restrictions & Item::CANT_QUOTE) && (!empty($item['quote-uri']) || !empty($item['quote-uri-id']))) {
+ return true;
+ }
+
return false;
}
diff --git a/src/Model/Mail.php b/src/Model/Mail.php
index 8366e91654..f42f67d3ad 100644
--- a/src/Model/Mail.php
+++ b/src/Model/Mail.php
@@ -223,7 +223,7 @@ class Mail
}
if ($post_id) {
- Worker::add(Worker::PRIORITY_HIGH, "Notifier", Delivery::MAIL, $post_id);
+ Worker::add(Worker::PRIORITY_HIGH, "Notifier", Delivery::MAIL, $post_id, $sender_uid);
return intval($post_id);
} else {
return -3;
diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index 74edaf360d..833834e771 100644
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -436,6 +436,10 @@ class Photo
$storage = '';
$img_str = $image->asString();
+ if (!is_string($img_str)) {
+ return false;
+ }
+
try {
if (DBA::isResult($existing_photo)) {
$backend_ref = (string)$existing_photo['backend-ref'];
@@ -1389,8 +1393,10 @@ class Photo
$resource_id = self::newResource();
$album = DI::l10n()->t(self::BANNER_PHOTOS);
- if ($width > 960) {
- $image->scaleDown(960);
+ $max_banner_width = DI::config()->get('system', 'max_banner_width');
+
+ if ($width > $max_banner_width && $max_banner_width > 0) {
+ $image->scaleDown($max_banner_width);
}
$r = self::store($image, $uid, 0, $resource_id, $filename, $album, 3, self::USER_BANNER);
diff --git a/src/Model/Post/Media.php b/src/Model/Post/Media.php
index 764175d629..f75d8adfff 100644
--- a/src/Model/Post/Media.php
+++ b/src/Model/Post/Media.php
@@ -7,6 +7,7 @@
namespace Friendica\Model\Post;
+use FFMpeg\FFMpeg;
use Friendica\Content\PageInfo;
use Friendica\Content\Text\BBCode;
use Friendica\Core\Protocol;
@@ -126,7 +127,7 @@ class Media
{
$fields = ['mimetype', 'height', 'width', 'size', 'preview', 'preview-height', 'preview-width', 'blurhash', 'description'];
foreach ($fields as $field) {
- if (empty($media[$field])) {
+ if (!isset($media[$field]) || is_null($media[$field]) || $media[$field] === '') {
unset($media[$field]);
}
}
@@ -172,6 +173,22 @@ class Media
'" type="' . $media['mimetype'] . '" title="' . $media['description'] . '"[/attach]';
}
+ private static function setModified(array $media, string $lastModified): array
+ {
+ if (isset($media['modified']) && $media['modified'] != '') {
+ return $media;
+ }
+
+ if ($lastModified == '') {
+ return $media;
+ }
+
+ $media['modified'] = DateTimeFormat::utc($lastModified);
+ $media['published'] = $media['published'] ?? $media['modified'];
+
+ return $media;
+ }
+
/**
* Fetch additional data for the provided media array
*
@@ -203,7 +220,7 @@ class Media
// Workaround for systems that can't handle a HEAD request
if (!$curlResult->isSuccess() && in_array($curlResult->getReturnCode(), [400, 403, 405])) {
- $curlResult = DI::httpClient()->get($media['url'], HttpClientAccept::AS_DEFAULT, [HttpClientOptions::TIMEOUT => $timeout, HttpClientOptions::HEADERS => ['Range' => 'bytes=0-100000']]);
+ $curlResult = DI::httpClient()->get($media['url'], HttpClientAccept::AS_DEFAULT, [HttpClientOptions::TIMEOUT => $timeout, HttpClientOptions::HEADERS => ['Range' => 'bytes=0-100000'], HttpClientOptions::REQUEST => HttpClientRequest::CONTENTTYPE]);
$is_head = false;
}
if ($curlResult->isSuccess()) {
@@ -213,12 +230,7 @@ class Media
if (empty($media['size']) && $is_head) {
$media['size'] = (int)($curlResult->getHeader('Content-Length')[0] ?? strlen($curlResult->getBodyString() ?? ''));
}
- if (empty($media['modified']) && !empty($curlResult->getHeader('Last-Modified')[0])) {
- $media['modified'] = DateTimeFormat::utc($curlResult->getHeader('Last-Modified')[0]);
- if (empty($media['published'])) {
- $media['published'] = $media['modified'];
- }
- }
+ $media = self::setModified($media, $curlResult->getHeader('Last-Modified')[0] ?? '');
} else {
DI::logger()->notice('Could not fetch head', ['media' => $media, 'code' => $curlResult->getReturnCode()]);
}
@@ -256,7 +268,11 @@ class Media
if ($media['type'] === self::VIDEO) {
$media = self::getVideoInformationByFFMPEG($media);
- $media = self::getVideoDimensionsByID3($media, false);
+ $media = self::getVideoDimensionsByID3($media);
+ }
+
+ if ($media['type'] === self::HLS) {
+ $media = self::getHLSVideoDimensions($media);
}
if (in_array($media['type'], [self::TEXT, self::ACTIVITY, self::LD, self::JSON, self::HTML, self::XML, self::PLAIN])) {
@@ -479,18 +495,20 @@ class Media
$media['embed-html'] = $data['embed']['html'] ?? null;
$media['embed-height'] = $data['embed']['height'] ?? null;
$media['embed-width'] = $data['embed']['width'] ?? null;
+ $media['page-type'] = $data['pagetype'] ?? null;
$media['language'] = $data['language'] ?? null;
$media['published'] = $data['published'] ?? null;
$media['modified'] = $data['modified'] ?? null;
+ $media['schematypes'] = isset($data['schematypes']) ? json_encode($data['schematypes']) : null;
- if (DI::config()->get('system', 'add_page_media')) {
- if (!empty($data['audio'])) {
+ if (!isset($media['player-url']) && !isset($media['embed-html']) && DI::config()->get('system', 'add_page_media')) {
+ if (isset($data['audio']) && sizeof($data['audio']) == 1) {
foreach ($data['audio'] as $entry) {
self::insertMedia($entry, $media['uri-id']);
}
}
- if (!empty($data['video'])) {
+ if (isset($data['video']) && sizeof($data['video']) == 1) {
foreach ($data['video'] as $entry) {
self::insertMedia($entry, $media['uri-id']);
}
@@ -506,11 +524,6 @@ class Media
return;
}
- if (($element['mimetype'] ?? '') === 'application/x-mpegURL') {
- // Until we can detect live streaming, we don't store HLS streams
- return;
- }
-
$media = ['uri-id' => $uri_id];
$media['type'] = Post\Media::UNKNOWN;
$media['url'] = $element['src'];
@@ -599,9 +612,11 @@ class Media
if ($filetype == 'image') {
$type = self::IMAGE;
+ } elseif (($filetype == 'video') && in_array($subtype, ['x-mpegurl', 'mpegurl'])) {
+ $type = self::HLS;
} elseif ($filetype == 'video') {
$type = self::VIDEO;
- } elseif (($filetype == 'audio') && ($subtype == 'x-mpegurl')) {
+ } elseif (($filetype == 'audio') && in_array($subtype, ['x-mpegurl', 'mpegurl'])) {
$type = self::HLS;
} elseif ($filetype == 'audio') {
$type = self::AUDIO;
@@ -615,7 +630,7 @@ class Media
$type = self::TEXT;
} elseif (($filetype == 'application') && ($subtype == 'x-bittorrent')) {
$type = self::TORRENT;
- } elseif (($filetype == 'application') && in_array($subtype, ['vnd.apple.mpegurl', 'x-mpegurl'])) {
+ } elseif (($filetype == 'application') && in_array($subtype, ['vnd.apple.mpegurl', 'x-mpegurl', 'mpegurl'])) {
$type = self::HLS;
} elseif (($filetype == 'application') && ($subtype == 'activity+json')) {
$type = self::ACTIVITY;
@@ -646,7 +661,7 @@ class Media
return $media;
}
- if (isset($media['width']) && isset($media['height']) && $media['width'] > 0 && $media['height'] > 0 && isset($media['blurhash'])) {
+ if (isset($media['width']) && isset($media['height']) && is_numeric($media['width']) && is_numeric($media['height']) && isset($media['blurhash'])) {
return $media;
}
@@ -660,6 +675,34 @@ class Media
$media['height'] = $image->getHeight();
DI::logger()->debug('Detected video dimensions via FFMpeg preview', ['uri-id' => $media['uri-id'], 'url' => $media['url'], 'width' => $media['width'], 'height' => $media['height']]);
return $media;
+ } else {
+ try {
+ $ffmpeg = FFMpeg::create();
+ /** @var \FFMpeg\Media\Video $video */
+ $video = $ffmpeg->open($media['url']);
+
+ $has_video = false;
+ $has_audio = false;
+ foreach ($video->getStreams() as $stream) {
+ if ($stream->isVideo()) {
+ $has_video = true;
+
+ $media['width'] = $stream->get('width');
+ $media['height'] = $stream->get('height');
+ DI::logger()->debug('Detected video dimensions via FFMpeg', ['uri-id' => $media['uri-id'], 'url' => $media['url'], 'width' => $media['width'], 'height' => $media['height']]);
+ }
+ if ($stream->isAudio()) {
+ $has_audio = true;
+ }
+ }
+ if ($has_audio && !$has_video) {
+ $media['width'] = 0;
+ $media['height'] = 0;
+ DI::logger()->debug('Detected audio file via FFMpeg', ['uri-id' => $media['uri-id'], 'url' => $media['url']]);
+ }
+ } catch (\Throwable $th) {
+ DI::logger()->notice('Got exception', ['url' => $media['url'], 'code' => $th->getCode(), 'message' => $th->getMessage()]);
+ }
}
return $media;
@@ -669,35 +712,29 @@ class Media
* Fetch video dimensions using getID3
*
* @param array $media Media array
- * @param bool $full_file If true, the whole video will be fetched
* @return array media with added dimensions
*/
- private static function getVideoDimensionsByID3(array $media, bool $full_file): array
+ private static function getVideoDimensionsByID3(array $media): array
{
- if (isset($media['width']) && isset($media['height']) && $media['width'] > 0 && $media['height'] > 0) {
+ if (isset($media['width']) && isset($media['height']) && is_numeric($media['width']) && is_numeric($media['height'])) {
return $media;
}
- DI::logger()->debug('Fetch video dimensions', ['uri-id' => $media['uri-id'], 'url' => $media['url'], 'full_file' => $full_file]);
+ DI::logger()->debug('Fetch video dimensions', ['uri-id' => $media['uri-id'], 'url' => $media['url']]);
$timestamp = microtime(true);
$timeout = DI::config()->get('system', 'xrd_timeout');
- $options = $full_file ? [HttpClientOptions::TIMEOUT => $timeout] : [HttpClientOptions::TIMEOUT => $timeout, HttpClientOptions::HEADERS => ['Range' => 'bytes=0-1000000']];
- $curlResult = DI::httpClient()->get($media['url'], HttpClientAccept::AS_DEFAULT, $options);
+ $options = [HttpClientOptions::TIMEOUT => $timeout, HttpClientOptions::HEADERS => ['Range' => 'bytes=0-1000000'], HttpClientOptions::REQUEST => HttpClientRequest::MEDIAVERIFIER];
+ $curlResult = DI::httpClient()->get($media['url'], HttpClientAccept::VIDEO, $options);
if (!$curlResult->isSuccess()) {
- DI::logger()->notice('Could not fetch video', ['uri-id' => $media['uri-id'], 'url' => $media['url'], 'full_file' => $full_file, 'code' => $curlResult->getReturnCode()]);
+ DI::logger()->notice('Could not fetch video', ['uri-id' => $media['uri-id'], 'url' => $media['url'], 'code' => $curlResult->getReturnCode()]);
return $media;
}
- if ((!isset($media['modified']) || !$media['modified']) && isset($curlResult->getHeader('Last-Modified')[0]) && $curlResult->getHeader('Last-Modified')[0] != '') {
- $media['modified'] = DateTimeFormat::utc($curlResult->getHeader('Last-Modified')[0]);
- if (!isset($media['published']) || !$media['published']) {
- $media['published'] = $media['modified'];
- }
- }
+ $media = self::setModified($media, $curlResult->getHeader('Last-Modified')[0] ?? '');
$video = $curlResult->getBodyString() ?? '';
if (!$video) {
- DI::logger()->notice('Empty video content', ['uri-id' => $media['uri-id'], 'media' => $media, 'full_file' => $full_file]);
+ DI::logger()->notice('Empty video content', ['uri-id' => $media['uri-id'], 'media' => $media]);
return $media;
}
@@ -708,28 +745,68 @@ class Media
unlink($tempfile);
$runtime = number_format(microtime(true) - $timestamp, 3);
- // @todo When we find a way to read the video file in chunks, we can enable this part again.
- //if (isset($info['error']) && !$full_file && substr($info['error'][0], 0, 14) == 'Atom at offset') {
- // DI::logger()->info('Detection failed for shortened file, trying the full file now.', ['runtime' => $runtime, 'uri-id' => $media['uri-id'], 'url' => $media['url'], 'full_file' => $full_file, 'error' => $info['error']]);
- // return self::getVideoDimensions($media, true);
- //}
-
- if (isset($info['error'])) {
- DI::logger()->info('Error analyzing video', ['runtime' => $runtime, 'uri-id' => $media['uri-id'], 'url' => $media['url'], 'full_file' => $full_file, 'error' => $info['error']]);
- } elseif (isset($info['video']['resolution_x']) && isset($info['video']['resolution_y'])) {
+ if (isset($info['video']['resolution_x']) && isset($info['video']['resolution_y'])) {
$media['width'] = $info['video']['resolution_x'];
$media['height'] = $info['video']['resolution_y'];
- DI::logger()->debug('Detected video dimensions', ['runtime' => $runtime, 'uri-id' => $media['uri-id'], 'url' => $media['url'], 'full_file' => $full_file, 'width' => $media['width'], 'height' => $media['height']]);
+ DI::logger()->debug('Detected video dimensions', ['runtime' => $runtime, 'uri-id' => $media['uri-id'], 'url' => $media['url'], 'width' => $media['width'], 'height' => $media['height']]);
} elseif (isset($info['audio'])) {
$media['width'] = 0;
$media['height'] = 0;
- DI::logger()->debug('Detected audio file', ['runtime' => $runtime, 'uri-id' => $media['uri-id'], 'url' => $media['url'], 'full_file' => $full_file]);
+ DI::logger()->debug('Detected audio file', ['runtime' => $runtime, 'uri-id' => $media['uri-id'], 'url' => $media['url']]);
+ } elseif (isset($info['error'])) {
+ DI::logger()->info('Error analyzing video', ['runtime' => $runtime, 'uri-id' => $media['uri-id'], 'url' => $media['url'], 'error' => $info['error']]);
} else {
- DI::logger()->info('No video dimensions found', ['runtime' => $runtime, 'uri-id' => $media['uri-id'], 'url' => $media['url'], 'full_file' => $full_file, 'info' => $info]);
+ DI::logger()->info('No video dimensions found', ['runtime' => $runtime, 'uri-id' => $media['uri-id'], 'url' => $media['url'], 'info' => $info]);
}
return $media;
}
+ /**
+ * Fetch HLS video dimensions from the playlist
+ *
+ * @param array $media Media array
+ * @return array media with added dimensions
+ */
+ private static function getHLSVideoDimensions(array $media): array
+ {
+ if (isset($media['width']) && isset($media['height']) && is_numeric($media['width']) && is_numeric($media['height'])) {
+ return $media;
+ }
+
+ $resolutions = [];
+
+ $curlResult = DI::httpClient()->get($media['url'], HttpClientAccept::HLS, [HttpClientOptions::REQUEST => HttpClientRequest::MEDIAVERIFIER]);
+ if (!$curlResult->isSuccess()) {
+ DI::logger()->notice('Could not fetch video', ['uri-id' => $media['uri-id'], 'url' => $media['url'], 'code' => $curlResult->getReturnCode()]);
+ return $media;
+ }
+
+ $media = self::setModified($media, $curlResult->getHeader('Last-Modified')[0] ?? '');
+
+ foreach (explode("\n", $curlResult->getBodyString() ?? '') as $line) {
+ if (strpos(trim($line), '#EXT-X-STREAM-INF') === 0) {
+ if (preg_match('/RESOLUTION=([\d]+)x([\d]+)/', $line, $matches)) {
+ $resolutions[$matches[1]] = [(int)$matches[1], (int)$matches[2]];
+ }
+ }
+ }
+
+ if (!$resolutions) {
+ DI::logger()->debug('No resolutions found', ['uri-id' => $media['uri-id'], 'url' => $media['url']]);
+ return $media;
+ }
+
+ krsort($resolutions);
+ $resolution = current($resolutions);
+
+ $media['width'] = $resolution[0];
+ $media['height'] = $resolution[1];
+
+ DI::logger()->debug('Detected HLS resolutions', ['uri-id' => $media['uri-id'], 'url' => $media['url'], 'resolution' => $resolution]);
+
+ return $media;
+ }
+
/**
* Tests for path patterns that are used for picture links in Friendica
*
diff --git a/src/Model/Tag.php b/src/Model/Tag.php
index de4beb08ec..3a5cf1fef4 100644
--- a/src/Model/Tag.php
+++ b/src/Model/Tag.php
@@ -48,6 +48,7 @@ class Tag
const CAN_ANNOUNCE = 20;
const CAN_LIKE = 21;
const CAN_REPLY = 22;
+ const CAN_QUOTE = 23;
const ACCOUNT = 1;
const GENERAL_COLLECTION = 2;
@@ -71,7 +72,7 @@ class Tag
* @param integer $target Target (default: null)
* @return void
*/
- public static function store(int $uriId, int $type, string $name, string $url = '', int $target = null)
+ public static function store(int $uriId, int $type, string $name, string $url = '', ?int $target = null)
{
if ($type == self::HASHTAG) {
// Trim Unicode non-word characters
@@ -120,7 +121,7 @@ class Tag
}
if (empty($cid)) {
- if (!in_array($type, [self::TO, self::CC, self::BTO, self::BCC, self::AUDIENCE, self::ATTRIBUTED])) {
+ if (!in_array($type, [self::TO, self::CC, self::BTO, self::BCC, self::AUDIENCE, self::ATTRIBUTED, self::CAN_ANNOUNCE, self::CAN_LIKE, self::CAN_REPLY, self::CAN_QUOTE])) {
if (($type != self::HASHTAG) && !empty($url) && ($url != $name)) {
$url = strtolower($url);
} else {
@@ -212,7 +213,7 @@ class Tag
* @param int $type Type of tag
* @return int Tag id
*/
- public static function getID(string $name, string $url = '', int $type = null): int
+ public static function getID(string $name, string $url = '', ?int $type = null): int
{
$fields = ['name' => substr($name, 0, 96), 'url' => $url];
@@ -268,7 +269,7 @@ class Tag
*
* @return array Tag list
*/
- public static function getFromBody(string $body, string $tags = null): array
+ public static function getFromBody(string $body, ?string $tags = null): array
{
if (is_null($tags)) {
$tags = self::TAG_CHARACTER[self::HASHTAG] . self::TAG_CHARACTER[self::MENTION] . self::TAG_CHARACTER[self::EXCLUSIVE_MENTION];
@@ -289,7 +290,7 @@ class Tag
* @param string $tags Accepted tags
* @return void
*/
- public static function storeFromBody(int $uriId, string $body, string $tags = null)
+ public static function storeFromBody(int $uriId, string $body, ?string $tags = null)
{
$item = ['uri-id' => $uriId, 'body' => $body, 'quote-uri-id' => null];
self::storeFromArray($item, $tags);
@@ -302,7 +303,7 @@ class Tag
* @param string $tags Accepted tags
* @return void
*/
- public static function storeFromArray(array $item, string $tags = null)
+ public static function storeFromArray(array $item, ?string $tags = null)
{
DI::logger()->info('Check for tags', ['uri-id' => $item['uri-id'], 'hash' => $tags]);
diff --git a/src/Model/User.php b/src/Model/User.php
index 5195fb77a3..7923690ca6 100644
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -1178,9 +1178,10 @@ class User
{
$return = ['user' => null, 'password' => ''];
- $using_invites = DI::config()->get('system', 'invitation_only');
+ $using_invites = DI::config()->get('system', 'invitation_only', false);
+ $ignore_invites = (array_key_exists('ignore_invites', $data) && is_bool($data['ignore_invites'])) ? $data['ignore_invites'] : false;
+ $invite_id = (array_key_exists('invite_id', $data) && is_string($data['invite_id'])) ? trim($data['invite_id']) : '';
- $invite_id = !empty($data['invite_id']) ? trim($data['invite_id']) : '';
$username = !empty($data['username']) ? trim($data['username']) : '';
$nickname = !empty($data['nickname']) ? trim($data['nickname']) : '';
$email = !empty($data['email']) ? trim($data['email']) : '';
@@ -1201,7 +1202,9 @@ class User
$password = $password1;
}
- if ($using_invites) {
+
+ // Users created by the console or from the moderation page ignore invites
+ if ($using_invites && !$ignore_invites) {
if (!$invite_id) {
throw new Exception(DI::l10n()->t('An invitation is required.'));
}
@@ -1620,12 +1623,13 @@ class User
}
$result = self::create([
- 'username' => $name,
- 'email' => $email,
- 'nickname' => $nick,
- 'verified' => 1,
- 'language' => $lang,
- 'photo' => $avatar
+ 'ignore_invites' => true,
+ 'username' => $name,
+ 'email' => $email,
+ 'nickname' => $nick,
+ 'verified' => 1,
+ 'language' => $lang,
+ 'photo' => $avatar
]);
$user = $result['user'];
diff --git a/src/Module/ActivityPub/Objects.php b/src/Module/ActivityPub/Objects.php
index 4ebfe2724d..fa352ad87b 100644
--- a/src/Module/ActivityPub/Objects.php
+++ b/src/Module/ActivityPub/Objects.php
@@ -81,7 +81,13 @@ class Objects extends BaseModule
$last_modified = $item['changed'];
Network::checkEtagModified($etag, $last_modified);
- if (empty($this->parameters['activity']) && ($item['gravity'] != Item::GRAVITY_ACTIVITY)) {
+ if (($this->parameters['activity'] ?? '') === 'replies') {
+ $posts = Post::toArray(Post::selectPosts(['uri'], ['thr-parent-id' => $item['uri-id'], 'gravity' => Item::GRAVITY_COMMENT, 'deleted' => false, 'private' => [Item::PUBLIC, Item::UNLISTED]]));
+ $data = ['@context' => ActivityPub::CONTEXT];
+ $data['id'] = DI::baseUrl() . '/' . DI::args()->getQueryString();
+ $data['type'] = 'OrderedCollection';
+ $data['items'] = array_column($posts, 'uri');
+ } elseif (!isset($this->parameters['activity']) && ($item['gravity'] !== Item::GRAVITY_ACTIVITY)) {
$activity = ActivityPub\Transmitter::createCachedActivityFromItem($item['id'], false, true);
if (empty($activity['type'])) {
throw new HTTPException\NotFoundException();
@@ -99,7 +105,7 @@ class Objects extends BaseModule
} elseif (empty($this->parameters['activity']) || in_array(
$this->parameters['activity'],
['Create', 'Announce', 'Update', 'Like', 'Dislike', 'Accept', 'Reject',
- 'TentativeAccept', 'Follow', 'Add']
+ 'TentativeAccept', 'Follow', 'Add', 'Delete']
)) {
$data = ActivityPub\Transmitter::createCachedActivityFromItem($item['id']);
if (empty($data)) {
diff --git a/src/Module/ActivityPub/QuoteAuthorization.php b/src/Module/ActivityPub/QuoteAuthorization.php
new file mode 100644
index 0000000000..56d044335c
--- /dev/null
+++ b/src/Module/ActivityPub/QuoteAuthorization.php
@@ -0,0 +1,54 @@
+parameters['guid'])) {
+ throw new HTTPException\BadRequestException();
+ }
+
+ if (empty($this->parameters['remote'])) {
+ throw new HTTPException\BadRequestException();
+ }
+
+ $local = Post::selectFirst(['uri', 'author-link'], ['guid' => $this->parameters['guid'], 'origin' => true, 'private' => [Item::PUBLIC, Item::UNLISTED]]);
+ if (!isset($local['uri'])) {
+ throw new HTTPException\NotFoundException();
+ }
+
+ $remote = Post::selectFirstPost(['uri'], ['guid' => $this->parameters['remote']]);
+ if (!isset($remote['uri'])) {
+ throw new HTTPException\NotFoundException();
+ }
+
+ $data = [
+ '@context' => ActivityPub::CONTEXT,
+ 'type' => 'QuoteAuthorization',
+ 'id' => $local['uri'] . '/quote_authorization/' . $this->parameters['remote'],
+ 'attributedTo' => $local['author-link'],
+ 'interactingObject' => $remote['uri'],
+ 'interactionTarget' => $local['uri']
+ ];
+
+ // Relaxed CORS header for public items
+ header('Access-Control-Allow-Origin: *');
+ $this->jsonExit($data, 'application/activity+json');
+ }
+}
diff --git a/src/Module/Admin/Site.php b/src/Module/Admin/Site.php
index 2a3282abb3..d3542b892b 100644
--- a/src/Module/Admin/Site.php
+++ b/src/Module/Admin/Site.php
@@ -19,6 +19,7 @@ use Friendica\Model\User;
use Friendica\Module\BaseAdmin;
use Friendica\Module\Conversation\Community;
use Friendica\Module\Register;
+use Friendica\Protocol\ActivityPub\Processor;
use Friendica\Protocol\Relay;
use Friendica\Util\BasePath;
use Friendica\Util\EMailer\MailBuilder;
@@ -91,6 +92,8 @@ class Site extends BaseAdmin
$community_page_style = (!empty($_POST['community_page_style']) ? intval(trim($_POST['community_page_style'])) : 0);
$max_author_posts_community_page = (!empty($_POST['max_author_posts_community_page']) ? intval(trim($_POST['max_author_posts_community_page'])) : 0);
$max_server_posts_community_page = (!empty($_POST['max_server_posts_community_page']) ? intval(trim($_POST['max_server_posts_community_page'])) : 0);
+ $display_local_media = !empty($_POST['display_local_media']);
+ $display_remote_media = !empty($_POST['display_remote_media']);
$verifyssl = !empty($_POST['verifyssl']);
$proxyuser = (!empty($_POST['proxyuser']) ? trim($_POST['proxyuser']) : '');
@@ -134,6 +137,7 @@ class Site extends BaseAdmin
$worker_load_cooldown = (!empty($_POST['worker_load_cooldown']) ? intval($_POST['worker_load_cooldown']) : 0);
$worker_fastlane = !empty($_POST['worker_fastlane']);
$decoupled_receiver = (!empty($_POST['decoupled_receiver']) ? intval(trim($_POST['decoupled_receiver'])) : false);
+ $fetch_replies = (!empty($_POST['fetch_replies']) ? intval(trim($_POST['fetch_replies'])) : Processor::FETCH_REPLIES_ALL);
$cron_interval = (!empty($_POST['cron_interval']) ? intval($_POST['cron_interval']) : 1);
$worker_defer_limit = (!empty($_POST['worker_defer_limit']) ? intval($_POST['worker_defer_limit']) : 15);
$worker_fetch_limit = (!empty($_POST['worker_fetch_limit']) ? intval($_POST['worker_fetch_limit']) : 1);
@@ -269,6 +273,8 @@ class Site extends BaseAdmin
$transactionConfig->set('system', 'community_page_style', $community_page_style);
$transactionConfig->set('system', 'max_author_posts_community_page', $max_author_posts_community_page);
$transactionConfig->set('system', 'max_server_posts_community_page', $max_server_posts_community_page);
+ $transactionConfig->set('system', 'display_local_media', $display_local_media);
+ $transactionConfig->set('system', 'display_remote_media', $display_remote_media);
$transactionConfig->set('system', 'verifyssl', $verifyssl);
$transactionConfig->set('system', 'proxyuser', $proxyuser);
$transactionConfig->set('system', 'proxy', $proxy);
@@ -313,6 +319,7 @@ class Site extends BaseAdmin
$transactionConfig->set('system', 'worker_load_cooldown', $worker_load_cooldown);
$transactionConfig->set('system', 'worker_fastlane', $worker_fastlane);
$transactionConfig->set('system', 'decoupled_receiver', $decoupled_receiver);
+ $transactionConfig->set('system', 'fetch_replies', $fetch_replies);
$transactionConfig->set('system', 'cron_interval', max($cron_interval, 1));
$transactionConfig->set('system', 'worker_defer_limit', $worker_defer_limit);
$transactionConfig->set('system', 'worker_fetch_limit', max($worker_fetch_limit, 1));
@@ -381,6 +388,14 @@ class Site extends BaseAdmin
}
}
+ /* Reply fetch options */
+ $fetch_replies_choices = [
+ Processor::FETCH_REPLIES_ALL => DI::l10n()->t('Fetch replies on all posts'),
+ Processor::FETCH_REPLIES_NONE => DI::l10n()->t('Don\'t fetch replies'),
+ Processor::FETCH_REPLIES_FOLLOWED => DI::l10n()->t('Fetch replies on posts from followed contacts only'),
+ Processor::FETCH_REPLIES_INTERACTION => DI::l10n()->t('Fetch replies on posts with interactions only')
+ ];
+
/* Community page style */
$community_page_style_choices = [
Community::DISABLED => DI::l10n()->t('No community page'),
@@ -519,6 +534,8 @@ class Site extends BaseAdmin
'$community_page_style' => ['community_page_style', DI::l10n()->t('Community pages for visitors'), DI::config()->get('system', 'community_page_style'), DI::l10n()->t('Which community pages should be available for visitors. Local users always see both pages.'), $community_page_style_choices],
'$max_author_posts_community_page' => ['max_author_posts_community_page', DI::l10n()->t('Posts per user on community page'), DI::config()->get('system', 'max_author_posts_community_page'), DI::l10n()->t('The maximum number of posts per user on the local community page. This is useful, when a single user floods the local community page.')],
'$max_server_posts_community_page' => ['max_server_posts_community_page', DI::l10n()->t('Posts per server on community page'), DI::config()->get('system', 'max_server_posts_community_page'), DI::l10n()->t('The maximum number of posts per server on the global community page. This is useful, when posts from a single server flood the global community page.')],
+ '$display_local_media' => ['display_local_media', DI::l10n()->t('Display local media to visitors'), DI::config()->get('system', 'display_local_media'), DI::l10n()->t('When enabled, locally stored media, such as pictures and videos, will be displayed to visitors who are not logged in. When disabled, a message will appear informing visitors that the media is only available to logged-in users.')],
+ '$display_remote_media' => ['display_remote_media', DI::l10n()->t('Display remote media to visitors'), DI::config()->get('system', 'display_remote_media'), DI::l10n()->t('When enabled, visitors who are not logged in will be able to view non-locally stored media such as pictures and videos. When disabled, visitors will see a message informing them that the media is available on the remote site.')],
'$mail_able' => function_exists('imap_open'),
'$mail_enabled' => ['mail_enabled', DI::l10n()->t('Enable Mail support'), !DI::config()->get('system', 'imap_disabled', !function_exists('imap_open')), DI::l10n()->t('Enable built-in mail support to poll IMAP folders and to reply via mail.')],
'$mail_not_able' => DI::l10n()->t('Mail support can\'t be enabled because the PHP IMAP module is not installed.'),
@@ -570,6 +587,7 @@ class Site extends BaseAdmin
'$worker_load_cooldown' => ['worker_load_cooldown', DI::l10n()->t('Maximum load for workers'), DI::config()->get('system', 'worker_load_cooldown'), DI::l10n()->t('Maximum load that causes a cooldown before each worker function call.')],
'$worker_fastlane' => ['worker_fastlane', DI::l10n()->t('Enable fastlane'), DI::config()->get('system', 'worker_fastlane'), DI::l10n()->t('When enabed, the fastlane mechanism starts an additional worker if processes with higher priority are blocked by processes of lower priority.')],
'$decoupled_receiver' => ['decoupled_receiver', DI::l10n()->t('Decoupled receiver'), DI::config()->get('system', 'decoupled_receiver'), DI::l10n()->t('Decouple incoming ActivityPub posts by processing them in the background via a worker process. Only enable this on fast systems.')],
+ '$fetch_replies' => ['fetch_replies', DI::l10n()->t('Fetch replies mode'), DI::config()->get('system', 'fetch_replies'), DI::l10n()->t('Missing replies can be fetched upon receipt of an ActivityPub post.'), $fetch_replies_choices],
'$cron_interval' => ['cron_interval', DI::l10n()->t('Cron interval'), DI::config()->get('system', 'cron_interval'), DI::l10n()->t('Minimal period in minutes between two calls of the "Cron" worker job.')],
'$worker_defer_limit' => ['worker_defer_limit', DI::l10n()->t('Worker defer limit'), DI::config()->get('system', 'worker_defer_limit'), DI::l10n()->t('Per default the systems tries delivering for 15 times before dropping it.')],
'$worker_fetch_limit' => ['worker_fetch_limit', DI::l10n()->t('Worker fetch limit'), DI::config()->get('system', 'worker_fetch_limit'), DI::l10n()->t('Number of worker tasks that are fetched in a single query. Higher values should increase the performance, too high values will mostly likely decrease it. Only change it, when you know how to measure the performance of your system.')],
diff --git a/src/Module/Admin/Summary.php b/src/Module/Admin/Summary.php
index 282c15e4bc..2f6905103c 100644
--- a/src/Module/Admin/Summary.php
+++ b/src/Module/Admin/Summary.php
@@ -91,11 +91,11 @@ class Summary extends BaseAdmin
// Legacy config file warning
if (file_exists('.htconfig.php')) {
- $warningtext[] = DI::l10n()->t('Friendica\'s configuration now is stored in config/local.config.php, please copy config/local-sample.config.php and move your config from
.htconfig.php. See the Config help page for help with the transition.', DI::baseUrl() . '/help/Config');
+ $warningtext[] = DI::l10n()->t('Friendica\'s configuration now is stored in config/local.config.php, please copy config/local-sample.config.php and move your config from .htconfig.php. See the Config help page for help with the transition.', DI::baseUrl() . '/help/admin/config');
}
if (file_exists('config/local.ini.php')) {
- $warningtext[] = DI::l10n()->t('Friendica\'s configuration now is stored in config/local.config.php, please copy config/local-sample.config.php and move your config from config/local.ini.php. See the Config help page for help with the transition.', DI::baseUrl() . '/help/Config');
+ $warningtext[] = DI::l10n()->t('Friendica\'s configuration now is stored in config/local.config.php, please copy config/local-sample.config.php and move your config from config/local.ini.php. See the Config help page for help with the transition.', DI::baseUrl() . '/help/admin/config');
}
// Check server vitality
@@ -105,7 +105,7 @@ class Summary extends BaseAdmin
'%s is not reachable on your system. This is a severe configuration issue that prevents server to server communication. See the installation page for help.',
$well_known,
$well_known,
- DI::baseUrl() . '/help/Install'
+ DI::baseUrl() . '/help/admin/install'
);
}
diff --git a/src/Module/BaseSearch.php b/src/Module/BaseSearch.php
index 2a3bc8af02..a9ce8345f9 100644
--- a/src/Module/BaseSearch.php
+++ b/src/Module/BaseSearch.php
@@ -111,8 +111,10 @@ class BaseSearch extends BaseModule
protected static function printResult(ResultList $results, Pager $pager, string $header = ''): string
{
if ($results->getTotal() == 0) {
- DI::sysmsg()->addNotice(DI::l10n()->t('No matches'));
- return '';
+ $o = Renderer::replaceMacros(Renderer::getMarkupTemplate('section_title.tpl'), [
+ '$title' => DI::l10n()->t('No results.')
+ ]);
+ return $o;
}
$filtered = 0;
diff --git a/src/Module/Contact/Follow.php b/src/Module/Contact/Follow.php
index 72c5238184..4aac790b10 100644
--- a/src/Module/Contact/Follow.php
+++ b/src/Module/Contact/Follow.php
@@ -159,7 +159,7 @@ class Follow extends BaseModule
'$action' => $requestUrl,
'$name' => $contact['name'],
- '$url' => $contact['url'],
+ '$url' => $contact['alias'] ?: $contact['url'],
'$zrl' => OpenWebAuth::getZrlUrl($contact['url']),
'$myaddr' => $myaddr,
'$keywords' => $contact['keywords'],
@@ -173,7 +173,8 @@ class Follow extends BaseModule
if (!in_array($protocol, [Protocol::PHANTOM, Protocol::MAIL])) {
$this->page['aside'] = VCard::getHTML($contact, false, true);
- $output .= Renderer::replaceMacros(Renderer::getMarkupTemplate('section_title.tpl'),
+ $output .= Renderer::replaceMacros(
+ Renderer::getMarkupTemplate('section_title.tpl'),
['$title' => $this->t('Posts and Replies')]
);
diff --git a/src/Module/Contact/MatchInterests.php b/src/Module/Contact/MatchInterests.php
index 69713ef746..3e13caf1da 100644
--- a/src/Module/Contact/MatchInterests.php
+++ b/src/Module/Contact/MatchInterests.php
@@ -85,8 +85,11 @@ class MatchInterests extends BaseModule
$this->page['aside'] .= Widget::follow();
if (empty($profile['pub_keywords']) && empty($profile['prv_keywords'])) {
- $this->systemMessages->addNotice($this->t('No keywords to match. Please add keywords to your profile.'));
- return '';
+ $o = Renderer::replaceMacros(Renderer::getMarkupTemplate('contact/list.tpl'), [
+ '$title' => $this->t('Profile Match'),
+ '$additional_text' => $this->t('No keywords to match. Please add keywords to your profile.')
+ ]);
+ return $o;
}
if ($this->mode->isMobile()) {
@@ -132,14 +135,16 @@ class MatchInterests extends BaseModule
$entries = $this->parseContacts(json_decode($result->getBodyString()), $entries, $limit);
}
+ $additional_text = '';
if (empty($entries)) {
- $this->systemMessages->addNotice($this->t('No matches'));
+ $additional_text = $this->t('No matches');
}
$tpl = Renderer::getMarkupTemplate('contact/list.tpl');
return Renderer::replaceMacros($tpl, [
- '$title' => $this->t('Profile Match'),
- '$contacts' => array_slice($entries, 0, $limit),
+ '$title' => $this->t('Profile Match'),
+ '$contacts' => array_slice($entries, 0, $limit),
+ '$additional_text' => $additional_text,
]);
}
diff --git a/src/Module/Contact/Profile.php b/src/Module/Contact/Profile.php
index 0bacf9f29f..d322c9bc55 100644
--- a/src/Module/Contact/Profile.php
+++ b/src/Module/Contact/Profile.php
@@ -22,6 +22,7 @@ use Friendica\Core\L10n;
use Friendica\Core\Protocol;
use Friendica\Core\Renderer;
use Friendica\Core\Session\Capability\IHandleUserSessions;
+use Friendica\Core\Worker;
use Friendica\Database\Database;
use Friendica\Database\DBA;
use Friendica\Event\ArrayFilterEvent;
@@ -214,6 +215,10 @@ class Profile extends BaseModule
$this->updateContactFromProbe($contact['id']);
}
+ if ($cmd === 'fetchoutbox') {
+ Worker::add(Worker::PRIORITY_MEDIUM, 'FetchOutbox', $contact['id'], 0);
+ }
+
if ($cmd === 'block') {
if ($localRelationship->blocked) {
// @TODO Backward compatibility, replace with $localRelationship->unblock()
@@ -447,7 +452,7 @@ class Profile extends BaseModule
'$sparkle' => $sparkle,
'$url' => $url,
'$profileurllabel' => $this->t('Profile URL'),
- '$profileurl' => $contact['url'],
+ '$profileurl' => $contact['alias'] ?: $contact['url'],
'$account_type' => ContactModel::getAccountType($contact['contact-type']),
'$location' => BBCode::convertForUriId($contact['uri-id'] ?? 0, $contact['location']),
'$location_label' => $this->t('Location:'),
@@ -560,6 +565,16 @@ class Profile extends BaseModule
];
}
+ if (in_array($contact['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN])) {
+ $contact_actions['fetchoutbox'] = [
+ 'label' => $this->t('Fetch latest posts'),
+ 'url' => 'contact/' . $contact['id'] . '/fetchoutbox?t=' . $formSecurityToken,
+ 'title' => '',
+ 'sel' => '',
+ 'id' => 'fetchoutbox',
+ ];
+ }
+
$contact_actions['block'] = [
'label' => $localRelationship->blocked ? $this->t('Unblock') : $this->t('Block'),
'url' => 'contact/' . $contact['id'] . '/block?t=' . $formSecurityToken,
diff --git a/src/Module/Conversation/Community.php b/src/Module/Conversation/Community.php
index 5bc1727f64..8787268e9f 100644
--- a/src/Module/Conversation/Community.php
+++ b/src/Module/Conversation/Community.php
@@ -111,7 +111,9 @@ class Community extends Timeline
$items = $this->getCommunityItems();
if (!$this->database->isResult($items)) {
- $this->systemMessages->addNotice($this->l10n->t('No results.'));
+ $o .= Renderer::replaceMacros(Renderer::getMarkupTemplate('section_title.tpl'), [
+ '$title' => $this->l10n->t('No results.')
+ ]);
return $o;
}
diff --git a/src/Module/Conversation/Network.php b/src/Module/Conversation/Network.php
index 6e6647dbaf..7281f60153 100644
--- a/src/Module/Conversation/Network.php
+++ b/src/Module/Conversation/Network.php
@@ -166,38 +166,62 @@ class Network extends Timeline
new ArrayFilterEvent(ArrayFilterEvent::NETWORK_CONTENT_START, $hook_data)
);
- $o = '';
+ $o = '';
+ $widgetorder = json_decode($this->pConfig->get($this->session->getLocalUserId(), 'feature', 'widgetorder'));
- if (Feature::isEnabled($this->session->getLocalUserId(), Feature::CIRCLES)) {
- $this->page['aside'] .= Circle::sidebarWidget($module, $module . '/circle', 'standard', $this->circleId);
+ if (empty($widgetorder)) {
+ $widgetorder = [
+ Feature::CIRCLES,
+ Feature::GROUPS,
+ Feature::ARCHIVE,
+ Feature::NETWORKS,
+ Feature::ACCOUNTS,
+ Feature::CHANNELS,
+ Feature::SEARCHES,
+ Feature::FOLDERS,
+ Feature::NOSHARER,
+ Feature::TRENDING_TAGS
+ ];
}
- if (Feature::isEnabled($this->session->getLocalUserId(), Feature::GROUPS)) {
- $this->page['aside'] .= GroupManager::widget($this->session->getLocalUserId());
- }
- if (Feature::isEnabled($this->session->getLocalUserId(), Feature::ARCHIVE)) {
- $this->page['aside'] .= Widget::postedByYear($module . '/archive', $this->session->getLocalUserId(), false);
- }
- if (Feature::isEnabled($this->session->getLocalUserId(), Feature::NETWORKS)) {
- $this->page['aside'] .= Widget::networks($module, $this->network);
- }
- if (Feature::isEnabled($this->session->getLocalUserId(), Feature::ACCOUNTS)) {
- $this->page['aside'] .= Widget::accountTypes($module, $this->accountTypeString);
- }
- if (Feature::isEnabled($this->session->getLocalUserId(), Feature::CHANNELS)) {
- $this->page['aside'] .= Widget::channels($module, $this->selectedTab, $this->session->getLocalUserId());
- }
- if (Feature::isEnabled($this->session->getLocalUserId(), Feature::SEARCHES)) {
- $this->page['aside'] .= Widget\SavedSearches::getHTML($this->args->getQueryString());
- }
- if (Feature::isEnabled($this->session->getLocalUserId(), Feature::FOLDERS)) {
- $this->page['aside'] .= Widget::fileAs('filed', '');
- }
- if (($this->channel->isTimeline($this->selectedTab) || $this->userDefinedChannel->isTimeline($this->selectedTab, $this->session->getLocalUserId())) &&
- !in_array($this->selectedTab, [Channel::FOLLOWERS, Channel::FORYOU, Channel::DISCOVER]) && Feature::isEnabled($this->session->getLocalUserId(), Feature::NOSHARER)) {
- $this->page['aside'] .= $this->getNoSharerWidget('network');
- }
- if (Feature::isEnabled($this->session->getLocalUserId(), Feature::TRENDING_TAGS)) {
- $this->page['aside'] .= TrendingTags::getHTML($this->selectedTab);
+
+ foreach ($widgetorder as $widget) {
+ if (Feature::isEnabled($this->session->getLocalUserId(), $widget)) {
+ switch ($widget) {
+ case Feature::CIRCLES:
+ $this->page['aside'] .= Circle::sidebarWidget($module, $module . '/circle', 'standard', $this->circleId);
+ break;
+ case Feature::GROUPS:
+ $this->page['aside'] .= GroupManager::widget($this->session->getLocalUserId());
+ break;
+ case Feature::ARCHIVE:
+ $this->page['aside'] .= Widget::postedByYear($module . '/archive', $this->session->getLocalUserId(), false);
+ break;
+ case Feature::NETWORKS:
+ $this->page['aside'] .= Widget::networks($module, $this->network);
+ break;
+ case Feature::ACCOUNTS:
+ $this->page['aside'] .= Widget::accountTypes($module, $this->accountTypeString);
+ break;
+ case Feature::CHANNELS:
+ $this->page['aside'] .= Widget::channels($module, $this->selectedTab, $this->session->getLocalUserId());
+ break;
+ case Feature::SEARCHES:
+ $this->page['aside'] .= Widget\SavedSearches::getHTML($this->args->getQueryString());
+ break;
+ case Feature::FOLDERS:
+ $this->page['aside'] .= Widget::fileAs('filed', '');
+ break;
+ case Feature::TRENDING_TAGS:
+ $this->page['aside'] .= TrendingTags::getHTML($this->selectedTab);
+ break;
+ case Feature::NOSHARER:
+ if (($this->channel->isTimeline($this->selectedTab) || $this->userDefinedChannel->isTimeline($this->selectedTab, $this->session->getLocalUserId())) &&
+ !in_array($this->selectedTab, [Channel::FOLLOWERS, Channel::FORYOU, Channel::DISCOVER])) {
+ $this->page['aside'] .= $this->getNoSharerWidget('network');
+ }
+ break;
+ }
+ }
}
if ($this->pConfig->get($this->session->getLocalUserId(), 'system', 'infinite_scroll', true) && ($_GET['mode'] ?? '') != 'minimal') {
@@ -322,6 +346,19 @@ class Network extends Timeline
$tabs = array_merge($tabs, $this->getTabArray($this->community->getTimelines(true), 'network', 'channel'));
}
+ $menu_tab_order = json_decode($this->pConfig->get($this->session->getLocalUserId(), 'system', 'menu_timeline_order'));
+ if (!empty($menu_tab_order)) {
+ $tmp = [];
+ foreach ($menu_tab_order as $order) {
+ foreach ($tabs as $key => $val) {
+ if ($key == $order || $order == $val['code']) {
+ $tmp[$key] = $val;
+ }
+ }
+ }
+ $tabs = $tmp;
+ }
+
$hook_data = [
'tabs' => $tabs,
];
diff --git a/src/Module/FriendSuggest.php b/src/Module/FriendSuggest.php
index 4c9720a6d6..19dce9d549 100644
--- a/src/Module/FriendSuggest.php
+++ b/src/Module/FriendSuggest.php
@@ -91,7 +91,13 @@ class FriendSuggest extends BaseModule
{
$cid = intval($this->parameters['contact']);
- $contact = $this->dba->selectFirst('contact', [], ['id' => $cid, 'uid' => DI::userSession()->getLocalUserId()]);
+ $ucid = ContactModel::getUserContactId($cid, DI::userSession()->getLocalUserId());
+ if (!$ucid) {
+ DI::sysmsg()->addNotice($this->t('Contact not found.'));
+ $this->baseUrl->redirect();
+ }
+
+ $contact = ContactModel::getById($ucid);
if (empty($contact)) {
DI::sysmsg()->addNotice($this->t('Contact not found.'));
$this->baseUrl->redirect();
diff --git a/src/Module/Help.php b/src/Module/Help.php
index 59b40fd215..ca03da80d0 100644
--- a/src/Module/Help.php
+++ b/src/Module/Help.php
@@ -12,6 +12,7 @@ use Friendica\Content\Nav;
use Friendica\Content\Text\Markdown;
use Friendica\DI;
use Friendica\Network\HTTPException;
+use Friendica\Util\Strings;
/**
* Shows the friendica help based on the /doc/ directory
@@ -22,34 +23,34 @@ class Help extends BaseModule
{
Nav::setSelected('help');
- $text = '';
+ $text = '';
$filename = '';
$config = DI::config();
- $lang = DI::session()->get('language', $config->get('system', 'language'));
+ $lang = DI::session()->get('language', $config->get('system', 'language'));
// @TODO: Replace with parameter from router
if (DI::args()->getArgc() > 1) {
$path = '';
// looping through the argv keys bigger than 0 to build
// a path relative to /help
- for ($x = 1; $x < DI::args()->getArgc(); $x ++) {
+ for ($x = 1; $x < DI::args()->getArgc(); $x++) {
if (strlen($path)) {
$path .= '/';
}
$path .= DI::args()->get($x);
}
- $title = basename($path);
- $filename = $path;
- $text = self::loadDocFile('doc/' . $path . '.md', $lang);
+ $title = Strings::ucFirst(basename($path));
+ $filename = $path;
+ $text = self::loadDocFile($path . '.md', $lang);
DI::page()['title'] = DI::l10n()->t('Help:') . ' ' . str_replace('-', ' ', $title);
}
- $home = self::loadDocFile('doc/Home.md', $lang);
+ $home = self::loadDocFile('home.md', $lang);
if (!$text) {
- $text = $home;
- $filename = "Home";
+ $text = $home;
+ $filename = "home";
DI::page()['title'] = DI::l10n()->t('Help');
} else {
DI::page()['aside'] = Markdown::convert($home, false);
@@ -61,17 +62,18 @@ class Help extends BaseModule
$html = Markdown::convert($text, false);
- if ($filename !== "Home") {
+ if ($filename !== "home") {
// create TOC but not for home
- $lines = explode("\n", $html);
- $toc = "TOC
- ";
+ $lines = explode("\n", $html);
+ $back_text = DI::l10n()->t('Home');
+ $toc = "
- ";
}
- $idNum[$level] ++;
+ $idNum[$level]++;
$href = "help/{$filename}#{$anchor}";
$toc .= "
- " . strip_tags($line) . " "; - $id = implode("_", array_slice($idNum, 1, $level)); + $id = implode("_", array_slice($idNum, 1, $level)); $line = "" . $line; $line = "" . $line; @@ -110,16 +112,25 @@ class Help extends BaseModule return $html; } - private static function loadDocFile($fileName, $lang = 'en') + private static function loadDocFile($filePath, $lang = 'en') { - $baseName = basename($fileName); - $dirName = dirname($fileName); - if (file_exists("$dirName/$lang/$baseName")) { - return file_get_contents("$dirName/$lang/$baseName"); + $baseDir = "doc"; + + // Try loading docs inside a language dir first, then try English dir, then fall back to looking at the root dir + $docPath = "$baseDir/$lang/$filePath"; + if (file_exists($docPath)) { + return file_get_contents($docPath); } - if (file_exists($fileName)) { - return file_get_contents($fileName); + $docPath = "$baseDir/en/$filePath"; + if (file_exists($docPath)) { + return file_get_contents($docPath); + } + + // Delete this once database docs have been moved into en/spec/database + $docPath = "$baseDir/$filePath"; + if (file_exists($docPath)) { + return file_get_contents($docPath); } return ''; diff --git a/src/Module/Item/Complete.php b/src/Module/Item/Complete.php new file mode 100644 index 0000000000..7982f8a0bc --- /dev/null +++ b/src/Module/Item/Complete.php @@ -0,0 +1,46 @@ +debug('Complete thread requested.', ['parameters' => $this->parameters]); + if (!DI::userSession()->isAuthenticated()) { + throw new HttpException\ForbiddenException($l10n->t('Access denied.')); + } + + if (!isset($this->parameters['id'])) { + throw new HTTPException\BadRequestException(); + } + + $itemId = intval($this->parameters['id']); + + Worker::add(Worker::PRIORITY_MEDIUM, 'FetchMissingReplies', $itemId); + + $return = [ + 'status' => 'ok', + 'item_id' => $itemId, + 'verb' => 'complete', + 'state' => 1 + ]; + + DI::logger()->debug('Complete thread executed.', ['parameters' => $this->parameters]); + $this->jsonExit($return); + } +} diff --git a/src/Module/Item/Display.php b/src/Module/Item/Display.php index e6bdf2e571..609cc12f77 100644 --- a/src/Module/Item/Display.php +++ b/src/Module/Item/Display.php @@ -31,6 +31,8 @@ use Friendica\Protocol\ActivityPub; use Friendica\Util\Profiler; use Friendica\Network\HTTPException; use Friendica\Content\Widget; +use Friendica\Core\System; +use Friendica\DI; use Psr\Log\LoggerInterface; /** @@ -87,7 +89,9 @@ class Display extends BaseModule $item = null; $itemUid = $this->session->getLocalUserId(); - $fields = ['uri-id', 'parent-uri-id', 'author-id', 'author-link', 'contact-id', 'contact-contact-type', 'body', 'uid', 'guid', 'gravity']; + $fields = ['uri-id', 'parent-uri-id', 'author-id', 'author-link', 'contact-id', 'contact-contact-type', 'body', 'uid', 'guid', 'gravity', + 'plink', 'origin', 'uri', 'post-reason', 'owner-contact-type', 'owner-network', 'owner-id', 'guid', + 'author-network', 'author-alias', 'private']; // Does the local user have this item? if ($this->session->getLocalUserId()) { @@ -124,6 +128,12 @@ class Display extends BaseModule return $displayNotFound->content(); } + $plink = Item::getPlink($item); + + if (!$this->session->getLocalUserId() && isset($plink['href']) && !DI::baseUrl()->isLocalUrl($plink['href'])) { + System::externalRedirect($plink['href']); + } + if ($item['gravity'] != Item::GRAVITY_PARENT) { $parent = Post::selectFirst($fields, [ 'uid' => [0, $itemUid], diff --git a/src/Module/Media/Attachment/Browser.php b/src/Module/Media/Attachment/Browser.php index fd46499552..45162ed794 100644 --- a/src/Module/Media/Attachment/Browser.php +++ b/src/Module/Media/Attachment/Browser.php @@ -76,12 +76,12 @@ class Browser extends BaseModule protected function map_files(array $record): array { list($m1, $m2) = explode('/', $record['filetype']); - $filetype = file_exists(sprintf('images/icons/%s.png', $m1) ? $m1 : 'text'); + $filetype = file_exists(sprintf('images/icons/%s.png', $m1)) ? $m1 : 'text'; return [ sprintf('%s/attach/%s', $this->baseUrl, $record['id']), $record['filename'], - sprintf('%s/images/icon/16/%s.png', $this->baseUrl, $filetype), + sprintf('%s/images/icons/%s.png', $this->baseUrl, $filetype), ]; } } diff --git a/src/Module/Moderation/Blocklist/Contact.php b/src/Module/Moderation/Blocklist/Contact.php index 02bb451213..5511092034 100644 --- a/src/Module/Moderation/Blocklist/Contact.php +++ b/src/Module/Moderation/Blocklist/Contact.php @@ -95,15 +95,18 @@ class Contact extends BaseModeration $t = Renderer::getMarkupTemplate('moderation/blocklist/contact.tpl'); return Renderer::replaceMacros($t, [ // strings // - '$title' => $this->t('Moderation'), - '$page' => $this->t('Remote Contact Blocklist'), - '$description' => $this->t('This page allows you to prevent any message from a remote contact to reach your node.'), - '$submit' => $this->t('Block Remote Contact'), - '$select_all' => $this->t('select all'), - '$select_none' => $this->t('select none'), - '$block' => $this->t('Block'), - '$unblock' => $this->t('Unblock'), - '$no_data' => $this->t('No remote contact is blocked from this node.'), + '$title' => $this->t('Moderation'), + '$page' => $this->t('Remote Contact Blocklist'), + '$description' => $this->t('This page allows you to prevent any message from a remote contact to reach your node.'), + '$submit' => $this->t('Block Remote Contact'), + '$importexport' => $this->t('Import/Export'), + '$import_csv' => $this->t('Import from CSV file'), + '$export_csv' => $this->t('Export to CSV file'), + '$select_all' => $this->t('select all'), + '$select_none' => $this->t('select none'), + '$block' => $this->t('Block'), + '$unblock' => $this->t('Unblock'), + '$no_data' => $this->t('No remote contact is blocked from this node.'), '$h_contacts' => $this->t('Blocked Remote Contacts'), '$h_newblock' => $this->t('Block New Remote Contact'), diff --git a/src/Module/Moderation/Blocklist/Contact/Export.php b/src/Module/Moderation/Blocklist/Contact/Export.php new file mode 100644 index 0000000000..b8039cb0cd --- /dev/null +++ b/src/Module/Moderation/Blocklist/Contact/Export.php @@ -0,0 +1,53 @@ +checkModerationAccess(); + + $condition = ['uid' => 0, 'blocked' => true, 'network' => Protocol::FEDERATED]; + $contacts = Model\Contact::selectToArray(['url', 'addr', 'alias', 'block_reason'], $condition); + + header('Content-Type: text/csv; charset=utf-8'); + header('Content-Transfer-Encoding: Binary'); + header('Content-disposition: attachment; filename="blocked_contacts_' . date('Y-m-d') . '.csv"'); + + $output = fopen('php://output', 'w'); + + foreach ($contacts as $contact) { + // Prefer addr (user@domain), then alias, then url as fallback + $identifier = $contact['url']; + + if (!empty($contact['addr']) && strpos($contact['addr'], '@') !== false) { + $identifier = $contact['addr']; + } elseif (!empty($contact['alias'])) { + $identifier = $contact['alias']; + } + + fputcsv($output, [$identifier, $contact['block_reason'] ?? '']); + } + + fclose($output); + System::exit(); + } +} diff --git a/src/Module/Moderation/Blocklist/Contact/Import.php b/src/Module/Moderation/Blocklist/Contact/Import.php new file mode 100644 index 0000000000..cb9a96b277 --- /dev/null +++ b/src/Module/Moderation/Blocklist/Contact/Import.php @@ -0,0 +1,150 @@ +checkModerationAccess(); + + if (!isset($request['page_contactblock_upload']) && !isset($request['page_contactblock_import'])) { + return; + } + + self::checkFormSecurityTokenRedirectOnError('/moderation/blocklist/contact/import', 'moderation_contactblock_import'); + + if (isset($request['page_contactblock_upload'])) { + try { + $this->contactlist = $this->extractFromCSVFile($_FILES['listfile']['tmp_name']); + if (empty($this->contactlist)) { + $this->notices[] = $this->t('No valid contacts found in CSV file.'); + } + return; + } catch (\Throwable $e) { + $this->notices[] = $this->t('Error importing contact file: %s', $e->getMessage()); + return; + } + } elseif (isset($request['page_contactblock_import'])) { + $this->contactlist = json_decode($request['contactlist'], true); + if ($this->contactlist === null) { + $this->notices[] = $this->t('Error parsing contact data.'); + return; + } + } + + $queued = 0; + $skipped = 0; + $purge = !empty($request['purge']); + + foreach ($this->contactlist as $item) { + $contact_url = $item['url'] ?? ''; + $block_reason = $item['reason'] ?? ''; + + if (empty($contact_url)) { + $skipped++; + continue; + } + + Worker::add(Worker::PRIORITY_LOW, 'Contact\BlockByUrl', $contact_url, $block_reason, $purge); + $queued++; + } + + if ($queued > 0) { + $this->notices[] = $this->tt('%d contact blocking was queued.', '%d contact blockings were queued.', $queued); + } + if ($skipped > 0) { + $this->notices[] = $this->tt('%d contact was skipped (empty URL).', '%d contacts were skipped (empty URL).', $skipped); + } + + $this->contactlist = []; + } + + /** + * @param array $request + * @return string + * @throws HTTPException\ServiceUnavailableException + */ + protected function content(array $request = []): string + { + parent::content(); + + $t = Renderer::getMarkupTemplate('moderation/blocklist/contact/import.tpl'); + return Renderer::replaceMacros($t, [ + '$notices' => $this->notices, + '$l10n' => [ + 'return_list' => $this->t('← Return to the list'), + 'title' => $this->t('Moderation'), + 'page' => $this->t('Import a Contact Blocklist'), + 'download' => $this->t('
Upload a CSV file with contact URLs and reasons for blocking.
'), + 'upload' => $this->t('Upload file'), + 'contacts' => $this->t('Contacts to import'), + 'contact_url' => $this->t('Contact URL'), + 'block_reason' => $this->t('Block Reason'), + 'import' => $this->t('Import Contacts'), + 'contact_count' => $this->tt('%d total contact', '%d total contacts', count($this->contactlist)), + 'purge' => $this->t('Also purge contacts'), + 'purge_desc' => $this->t('Removes all content related to these contacts from the node. Keeps the contact records. This action cannot be undone.'), + ], + '$listfile' => ['listfile', $this->t('Contact blocklist CSV file'), '', '', $this->t('Required'), '', 'file'], + '$purge' => ['purge', $this->t('Also purge contacts'), false, $this->t('Removes all content related to these contacts from the node. Keeps the contact records. This action cannot be undone.')], + '$contactlist' => $this->contactlist, + '$form_security_token' => self::getFormSecurityToken('moderation_contactblock_import') + ]); + } + + /** + * Extracts a contact block list from the provided CSV file name. + * + * @param string $filename + * + * @return array + * @throws \Exception + */ + private function extractFromCSVFile(string $filename): array + { + $fp = fopen($filename, 'r'); + if ($fp === false) { + throw new \Exception($this->l10n->t('The file "%s" could not be opened for importing', $filename)); + } + + $contactlist = []; + while (($data = fgetcsv($fp, 1000)) !== false) { + $item = [ + 'url' => $data[0] ?? '', + 'reason' => $data[1] ?? '', + ]; + + if (!empty($item['url']) && !in_array($item, $contactlist)) { + $contactlist[] = $item; + } + } + + fclose($fp); + return $contactlist; + } +} diff --git a/src/Module/Moderation/Item/Source.php b/src/Module/Moderation/Item/Source.php index 64858294eb..018429ae06 100644 --- a/src/Module/Moderation/Item/Source.php +++ b/src/Module/Moderation/Item/Source.php @@ -47,16 +47,16 @@ class Source extends BaseModeration $guid = basename($request['guid'] ?? $this->parameters['guid'] ?? ''); $item_uri = ''; - $item_id = ''; - $terms = []; - $source = ''; + $item_id = ''; + $terms = []; + $source = ''; if (!empty($guid)) { $item = Model\Post::selectFirst(['id', 'uri-id', 'guid', 'uri'], ['guid' => $guid]); if ($item) { - $item_id = $item['id']; + $item_id = $item['id']; $item_uri = $item['uri']; - $terms = Model\Tag::getByURIId($item['uri-id'], [Model\Tag::HASHTAG, Model\Tag::MENTION, Model\Tag::IMPLICIT_MENTION]); + $terms = Model\Tag::getByURIId($item['uri-id'], [Model\Tag::HASHTAG, Model\Tag::MENTION, Model\Tag::IMPLICIT_MENTION]); $activity = Model\Post\Activity::getByURIId($item['uri-id']); if (!empty($activity)) { @@ -68,7 +68,8 @@ class Source extends BaseModeration $tpl = Renderer::getMarkupTemplate('moderation/item/source.tpl'); return Renderer::replaceMacros($tpl, [ '$l10n' => [ - 'title' => $this->t('Item Source'), + 'title' => $this->t('Moderation'), + 'page' => $this->t('Item Source'), 'itemidlbl' => $this->t('Item Id'), 'itemurilbl' => $this->t('Item URI'), 'submit' => $this->t('Submit'), @@ -79,12 +80,12 @@ class Source extends BaseModeration 'urllbl' => $this->t('URL'), 'mentionlbl' => $this->t('Mention'), 'implicitlbl' => $this->t('Implicit Mention'), - 'error' => $this->tt('Error','Errors', 1), + 'error' => $this->tt('Error', 'Errors', 1), 'notfound' => $this->t('Item not found'), 'nosource' => $this->t('No source recorded'), 'noconfig' => !$this->config->get('debug', 'store_source') ? $this->t('Please make sure thedebug.store_sourceconfig key is set inconfig/local.config.phpfor future items to have sources.') : '', ], - '$guid_field' => ['guid', $this->t('Item Guid'), $guid, ''], + '$guid_field' => ['guid', '', $guid, '', '', 'autofocus', '', $this->t('Item Guid')], '$guid' => $guid, '$item_uri' => $item_uri, '$item_id' => $item_id, diff --git a/src/Module/Moderation/Report/Create.php b/src/Module/Moderation/Report/Create.php index a3887a2f82..d75e8e0fab 100644 --- a/src/Module/Moderation/Report/Create.php +++ b/src/Module/Moderation/Report/Create.php @@ -23,6 +23,7 @@ use Friendica\Model\Contact; use Friendica\Model\Item; use Friendica\Model\Post; use Friendica\Moderation\Entity\Report; +use Friendica\Module\Moderation\Utils\ReportUtil; use Friendica\Module\Response; use Friendica\Navigation\SystemMessages; use Friendica\Network\HTTPException\ForbiddenException; @@ -46,13 +47,16 @@ class Create extends BaseModule private $factory; /** @var \Friendica\Moderation\Repository\Report */ private $repository; + /** @var ReportUtil */ + protected $reportUtil; - public function __construct(\Friendica\Moderation\Repository\Report $repository, \Friendica\Moderation\Factory\Report $factory, UserSession $session, App\Page $page, SystemMessages $systemMessages, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = []) + public function __construct(\Friendica\Moderation\Repository\Report $repository, ReportUtil $reportUtil, \Friendica\Moderation\Factory\Report $factory, UserSession $session, App\Page $page, SystemMessages $systemMessages, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = []) { parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters); $this->systemMessages = $systemMessages; $this->page = $page; + $this->reportUtil = $reportUtil; $this->session = $session; $this->factory = $factory; $this->repository = $repository; @@ -305,23 +309,6 @@ class Create extends BaseModule $contact = Contact::getById($request['cid']); } - switch ($request['category'] ?? 0) { - case Report::CATEGORY_SPAM: $category = $this->t('Spam'); - break; - case Report::CATEGORY_ILLEGAL: $category = $this->t('Illegal Content'); - break; - case Report::CATEGORY_SAFETY: $category = $this->t('Community Safety'); - break; - case Report::CATEGORY_UNWANTED: $category = $this->t('Unwanted Content/Behavior'); - break; - case Report::CATEGORY_VIOLATION: $category = $this->t('Rules Violation'); - break; - case Report::CATEGORY_OTHER: $category = $this->t('Other'); - break; - - default: $category = ''; - } - if (!empty($request['rule-ids'])) { $rules = array_filter(System::getRules(true), function ($rule_id) use ($request) { return in_array($rule_id, $request['rule-ids']); @@ -339,7 +326,7 @@ class Create extends BaseModule ], '$contact' => $contact, - '$category' => $category, + '$category' => $this->reportUtil->getReportCategoryName($request['category'] ?? 0), '$rules' => $rules ?? [], '$comment' => BBCode::convertForUriId($contact['uri-id'] ?? 0, $this->session->get('report_comment') ?? '', BBCode::EXTERNAL), '$posts' => count($request['uri-ids'] ?? []), diff --git a/src/Module/Moderation/Reports.php b/src/Module/Moderation/Reports.php index 1b713abb66..859af6e7f1 100644 --- a/src/Module/Moderation/Reports.php +++ b/src/Module/Moderation/Reports.php @@ -19,6 +19,7 @@ use Friendica\Core\Session\Capability\IHandleUserSessions; use Friendica\Database\Database; use Friendica\Database\DBA; use Friendica\Module\BaseModeration; +use Friendica\Module\Moderation\Utils\ReportUtil; use Friendica\Module\Response; use Friendica\Navigation\SystemMessages; use Friendica\Util\DateTimeFormat; @@ -29,12 +30,15 @@ class Reports extends BaseModeration { /** @var Database */ private $database; + /** @var ReportUtil */ + protected $reportUtil; - public function __construct(Database $database, Page $page, AppHelper $appHelper, SystemMessages $systemMessages, IHandleUserSessions $session, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = []) + public function __construct(Database $database, Page $page, ReportUtil $reportUtil, AppHelper $appHelper, SystemMessages $systemMessages, IHandleUserSessions $session, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = []) { parent::__construct($page, $appHelper, $systemMessages, $session, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters); - $this->database = $database; + $this->database = $database; + $this->reportUtil = $reportUtil; } protected function post(array $request = []) @@ -72,8 +76,9 @@ LIMIT ?, ?", $reports = []; while ($report = $this->database->fetch($query)) { - $report['posts'] = []; - $report['created'] = DateTimeFormat::local($report['created'], DateTimeFormat::MYSQL); + $report['posts'] = []; + $report['created'] = DateTimeFormat::local($report['created'], DateTimeFormat::MYSQL); + $report['category'] = $this->reportUtil->getReportCategoryName($report['category-id']); $reports[$report['id']] = $report; } diff --git a/src/Module/Moderation/Users/Create.php b/src/Module/Moderation/Users/Create.php index 6e16e37f4e..36a3a7a4a5 100644 --- a/src/Module/Moderation/Users/Create.php +++ b/src/Module/Moderation/Users/Create.php @@ -20,9 +20,9 @@ class Create extends BaseUsers self::checkFormSecurityTokenRedirectOnError('moderation/users/create', 'admin_users_create'); - $nu_name = $request['new_user_name'] ?? ''; + $nu_name = $request['new_user_name'] ?? ''; $nu_nickname = $request['new_user_nickname'] ?? ''; - $nu_email = $request['new_user_email'] ?? ''; + $nu_email = $request['new_user_email'] ?? ''; $nu_language = DI::config()->get('system', 'language'); if ($nu_name !== '' && $nu_email !== '' && $nu_nickname !== '') { @@ -44,18 +44,19 @@ class Create extends BaseUsers $t = Renderer::getMarkupTemplate('moderation/users/create.tpl'); return self::getTabsHTML('all') . Renderer::replaceMacros($t, [ // strings // - '$title' => $this->t('Administration'), - '$page' => $this->t('New User'), - '$submit' => $this->t('Add User'), + '$title' => $this->t('Moderation'), + '$page' => $this->t('Create user'), + '$description' => $this->t('Type in the details for the new user to be created.'), + '$submit' => $this->t('Create user'), '$form_security_token' => self::getFormSecurityToken('admin_users_create'), // values // '$query_string' => $this->args->getQueryString(), - '$newusername' => ['new_user_name', $this->t('Name'), '', $this->t('Name of the new user.')], - '$newusernickname' => ['new_user_nickname', $this->t('Nickname'), '', $this->t('Nickname of the new user.')], - '$newuseremail' => ['new_user_email', $this->t('Email'), '', $this->t('Email address of the new user.'), '', '', 'email'], + '$newusername' => ['new_user_name', '', '', '', true, 'autofocus', '', $this->t('Display name')], + '$newusernickname' => ['new_user_nickname', '', '', '', true, '', '', $this->t('Nickname')], + '$newuseremail' => ['new_user_email', '', '', '', true, 'email', '', $this->t('Email')], ]); } } diff --git a/src/Module/Moderation/Utils/ReportUtil.php b/src/Module/Moderation/Utils/ReportUtil.php new file mode 100644 index 0000000000..a06d34d5cb --- /dev/null +++ b/src/Module/Moderation/Utils/ReportUtil.php @@ -0,0 +1,41 @@ +l10n = $l10n; + } + + public function getReportCategoryName(int $category): string + { + switch ($category) { + case Report::CATEGORY_SPAM: + return $this->l10n->t('Spam'); + case Report::CATEGORY_ILLEGAL: + return $this->l10n->t('Illegal Content'); + case Report::CATEGORY_SAFETY: + return $this->l10n->t('Community Safety'); + case Report::CATEGORY_UNWANTED: + return $this->l10n->t('Unwanted Content/Behavior'); + case Report::CATEGORY_VIOLATION: + return $this->l10n->t('Rules Violation'); + case Report::CATEGORY_OTHER: + return $this->l10n->t('Other'); + default: + return ""; + }; + } +} diff --git a/src/Module/Notifications/Introductions.php b/src/Module/Notifications/Introductions.php index 363fab6b5d..860e446da3 100644 --- a/src/Module/Notifications/Introductions.php +++ b/src/Module/Notifications/Introductions.php @@ -161,7 +161,7 @@ class Introductions extends BaseNotifications $header .= ' (' . ContactSelector::networkToName($Introduction->getNetwork(), '', $gsid) . ')'; if ($Introduction->getNetwork() != Protocol::DIASPORA) { - $discard = $this->t('Discard'); + $discard = $this->t('Remove'); } else { $discard = ''; } diff --git a/src/Module/Post/Edit.php b/src/Module/Post/Edit.php index 92e86e4892..daac9aaf8d 100644 --- a/src/Module/Post/Edit.php +++ b/src/Module/Post/Edit.php @@ -99,10 +99,12 @@ class Edit extends BaseModule ]); $this->page['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('jot-header.tpl'), [ - '$ispublic' => ' ', - '$geotag' => '', - '$nickname' => $this->session->getLocalUserNickname(), - '$is_mobile' => $this->mode->isMobile(), + '$ispublic' => ' ', + '$geotag' => '', + '$nickname' => $this->session->getLocalUserNickname(), + '$postPublished' => $this->t('Post published.'), + '$goToPost' => $this->t('Go to post'), + '$is_mobile' => $this->mode->isMobile(), ]); if (strlen($item['allow_cid']) || strlen($item['allow_gid']) || strlen($item['deny_cid']) || strlen($item['deny_gid'])) { diff --git a/src/Module/Profile/Schedule.php b/src/Module/Profile/Schedule.php index 212c02b78a..82415ce370 100644 --- a/src/Module/Profile/Schedule.php +++ b/src/Module/Profile/Schedule.php @@ -16,6 +16,8 @@ use Friendica\Model\Post; use Friendica\Module\BaseProfile; use Friendica\Network\HTTPException; use Friendica\Util\DateTimeFormat; +use Friendica\Model\Item; +use Friendica\Model\Tag; class Schedule extends BaseProfile { @@ -45,16 +47,58 @@ class Schedule extends BaseProfile $o = self::getTabsHTML('schedule', true, DI::userSession()->getLocalUserNickname(), false); $schedule = []; - $delayed = DBA::select('delayed-post', [], ['uid' => DI::userSession()->getLocalUserId()]); + $delayed = DBA::select('delayed-post', [], ['uid' => DI::userSession()->getLocalUserId()]); while ($row = DBA::fetch($delayed)) { $parameter = Post\Delayed::getParametersForid($row['id']); if (empty($parameter)) { continue; } + $parameter['item']['uri-id'] = $parameter['parameters']['wid']; + // scheduling strips [url] BBcode from hashtags so we need to add them back: + $parameter['item']['body'] = Item::setHashtags($parameter['item']['body']); + // now we need to extract them into an array: + $extracted_tags = Tag::getFromBody($parameter['item']['body']); + // then we prep the body to get rendered HTML back: + Item::prepareBody($parameter['item'], true); + // Item:prepareBody creates the tag arrays but they will be empty... + $tags = [ + 'tags' => [], + 'hashtags' => [], + 'mentions' => [], + 'implicit_mentions' => [], + ]; + // populate our $tags placeholder array: + if (!empty($extracted_tags)) { + foreach ($extracted_tags as $tag) { + $html = '' . $tag[1] . '' . $tag[3] . ''; + if ($tag[1] == "#") { + $tags['hashtags'][] = $html; + } elseif ($tag[1] == "@") { + $tags['mentions'][] = $html; + } elseif ($tag[1] == "1") { + $tags['implicit_mentions'][] = $html; + } else { // no idea what it isset + } + // tags is catch-all for all of them + $tags['tags'][] = $html; + } + } + // populate the ['item'] tag arrays... + $parameter['item']['tags'] = $tags['tags']; + $parameter['item']['hashtags'] = $tags['hashtags']; + $parameter['item']['mentions'] = $tags['mentions']; + $parameter['item']['implicit_mentions'] = $tags['implicit_mentions']; + // fetch privacy + if ($parameter['item']['private'] == 1) { + $parameter['item']['lock'] = DI::l10n()->t('Private Message'); + } + // we no return to our scheduled program... $schedule[] = [ 'id' => $row['id'], - 'scheduled_at' => DateTimeFormat::local($row['delayed']), - 'content' => BBCode::toPlaintext($parameter['item']['body'], false) + 'scheduled_at' => DateTimeFormat::local($row['delayed'], "D, d M Y H:i:s e"), + 'content' => BBCode::toPlaintext($parameter['item']['body'], false), + 'item' => $parameter['item'], + 'via' => DI::l10n()->t('via'), ]; } DBA::close($delayed); diff --git a/src/Module/Settings/Channels.php b/src/Module/Settings/Channels.php index ba553d93e7..47a7faecd0 100644 --- a/src/Module/Settings/Channels.php +++ b/src/Module/Settings/Channels.php @@ -207,7 +207,7 @@ class Channels extends BaseSettings 'exclude_tags' => ["new_exclude_tags", $this->t("Exclude Tags"), '', $exclude_tags_translation], 'min_size' => ["new_min_size", $this->t("Minimum Size"), '', $this->t('Minimum post size. Leave empty for no minimum size. The size is calculated without links, attached posts, mentions or hashtags.')], 'max_size' => ["new_max_size", $this->t("Maximum Size"), '', $this->t('Maximum post size. Leave empty for no maximum size. The size is calculated without links, attached posts, mentions or hashtags.')], - 'text_search' => ["new_text_search", $this->t("Full Text Search"), '', $this->t('Search terms for the body, supports the "boolean mode" operators from MariaDB. See the help for a complete list of operators and additional keywords: %s', 'help/Channels')], + 'text_search' => ["new_text_search", $this->t("Full Text Search"), '', $this->t('Search terms for the body, supports the "boolean mode" operators from MariaDB. See the help for a complete list of operators and additional keywords: %s', 'help/channels')], 'image' => ['new_image', $this->t("Images"), false, $this->t("Check to display images in the channel.")], 'video' => ["new_video", $this->t("Videos"), false, $this->t("Check to display videos in the channel.")], 'audio' => ["new_audio", $this->t("Audio"), false, $this->t("Check to display audio in the channel.")], diff --git a/src/Module/Settings/Connectors.php b/src/Module/Settings/Connectors.php index 7e5b57a783..0d10abd22c 100644 --- a/src/Module/Settings/Connectors.php +++ b/src/Module/Settings/Connectors.php @@ -63,15 +63,15 @@ class Connectors extends BaseSettings $this->pconfig->set($this->session->getLocalUserId(), 'system', 'api_auto_attach', intval($request['api_auto_attach'])); $this->pconfig->set($this->session->getLocalUserId(), 'system', 'article_mode', intval($request['article_mode'])); } elseif (!empty($request['mail-submit']) && function_exists('imap_open') && !$this->config->get('system', 'imap_disabled')) { - $mail_server = $request['mail_server'] ?? ''; - $mail_port = $request['mail_port'] ?? ''; + $mail_server = $request['mail_server'] ?? ''; + $mail_port = $request['mail_port'] ?? ''; $mail_ssl = strtolower(trim($request['mail_ssl'] ?? '')); - $mail_user = $request['mail_user'] ?? ''; - $mail_pass = trim($request['mail_pass'] ?? ''); - $mail_action = trim($request['mail_action'] ?? ''); - $mail_movetofolder = trim($request['mail_movetofolder'] ?? ''); - $mail_replyto = $request['mail_replyto'] ?? ''; - $mail_pubmail = $request['mail_pubmail'] ?? ''; + $mail_user = $request['mail_user'] ?? ''; + $mail_pass = trim($request['mail_pass'] ?? ''); + $mail_action = trim($request['mail_action'] ?? ''); + $mail_movetofolder = trim($request['mail_movetofolder'] ?? ''); + $mail_replyto = $request['mail_replyto'] ?? ''; + $mail_pubmail = $request['mail_pubmail'] ?? ''; if (!$this->database->exists('mailacct', ['uid' => $this->session->getLocalUserId()])) { $this->database->insert('mailacct', ['uid' => $this->session->getLocalUserId()]); @@ -118,14 +118,14 @@ class Connectors extends BaseSettings { parent::content($request); - $accept_only_sharer = intval($this->pconfig->get($this->session->getLocalUserId(), 'system', 'accept_only_sharer')); + $accept_only_sharer = intval($this->pconfig->get($this->session->getLocalUserId(), 'system', 'accept_only_sharer')); $enable_cw = !intval($this->pconfig->get($this->session->getLocalUserId(), 'system', 'disable_cw')); $enable_smart_shortening = !intval($this->pconfig->get($this->session->getLocalUserId(), 'system', 'no_intelligent_shortening')); - $simple_shortening = intval($this->pconfig->get($this->session->getLocalUserId(), 'system', 'simple_shortening')); - $attach_link_title = intval($this->pconfig->get($this->session->getLocalUserId(), 'system', 'attach_link_title')); - $api_spoiler_title = intval($this->pconfig->get($this->session->getLocalUserId(), 'system', 'api_spoiler_title', true)); - $api_auto_attach = intval($this->pconfig->get($this->session->getLocalUserId(), 'system', 'api_auto_attach', false)); - $article_mode = intval($this->pconfig->get($this->session->getLocalUserId(), 'system', 'article_mode')); + $simple_shortening = intval($this->pconfig->get($this->session->getLocalUserId(), 'system', 'simple_shortening')); + $attach_link_title = intval($this->pconfig->get($this->session->getLocalUserId(), 'system', 'attach_link_title')); + $api_spoiler_title = intval($this->pconfig->get($this->session->getLocalUserId(), 'system', 'api_spoiler_title', true)); + $api_auto_attach = intval($this->pconfig->get($this->session->getLocalUserId(), 'system', 'api_auto_attach', false)); + $article_mode = intval($this->pconfig->get($this->session->getLocalUserId(), 'system', 'article_mode')); $connector_settings_forms = []; foreach ($this->database->selectToArray('hook', ['file', 'function'], ['hook' => 'connector_settings']) as $hook) { @@ -136,10 +136,10 @@ class Connectors extends BaseSettings $connector_settings_forms[$data['connector']] = Renderer::replaceMacros($tpl, [ '$connector' => $data['connector'], '$title' => $data['title'], - '$image' => $data['image'] ?? '', + '$image' => $data['image'] ?? '', '$enabled' => $data['enabled'] ?? true, '$open' => ($this->parameters['connector'] ?? '') === $data['connector'], - '$html' => $data['html'] ?? '', + '$html' => $data['html'] ?? '', '$submit' => $data['submit'] ?? $this->t('Save Settings'), ]); } @@ -161,7 +161,7 @@ class Connectors extends BaseSettings $mail_disabled = $this->t('Email access is disabled on this site.'); } - $mail_server = $mail_account['server'] ?? ''; + $mail_server = $mail_account['server'] ?? ''; $mail_port = (!empty($mail_account['port']) && is_numeric($mail_account['port'])) ? (int)$mail_account['port'] : ''; $mail_ssl = $mail_account['ssltype'] ?? ''; $mail_user = $mail_account['user'] ?? ''; @@ -223,7 +223,7 @@ class Connectors extends BaseSettings '$mail_pass' => ['mail_pass', $this->t('Email password:'), '', ''], '$mail_replyto' => ['mail_replyto', $this->t('Reply-to address:'), $mail_replyto, 'Optional'], '$mail_pubmail' => ['mail_pubmail', $this->t('Send public posts to all email contacts:'), $mail_pubmail, ''], - '$mail_action' => ['mail_action', $this->t('Action after import:'), $mail_action, '', [0 => $this->t('None'), 1 => $this->t('Delete'), 2 => $this->t('Mark as seen'), 3 => $this->t('Move to folder')]], + '$mail_action' => ['mail_action', $this->t('Action after import:'), $mail_action, '', [0 => $this->t('None'), 1 => $this->t('Delete'), 2 => $this->t('Mark as read'), 3 => $this->t('Move to folder')]], '$mail_movetofolder' => ['mail_movetofolder', $this->t('Move to folder:'), $mail_movetofolder, ''], '$submit' => $this->t('Save Settings'), ]); diff --git a/src/Module/Settings/Display.php b/src/Module/Settings/Display.php index 12da8f79eb..183e84c0f6 100644 --- a/src/Module/Settings/Display.php +++ b/src/Module/Settings/Display.php @@ -32,6 +32,7 @@ use Friendica\Module\Response; use Friendica\Navigation\SystemMessages; use Friendica\Network\HTTPException; use Friendica\Util\Profiler; +use Friendica\Util\Strings; use Psr\Log\LoggerInterface; /** @@ -106,6 +107,10 @@ class Display extends BaseSettings $update_content = (int)$request['update_content']; $embed_remote_media = (bool)$request['embed_remote_media']; $embed_media = (bool)$request['embed_media']; + $widget_timelineorder = trim($request['widget_timelineorder']); + $menu_timelineorder = trim($request['menu_timelineorder']); + $widget_timeline_reset = (bool)$request['widget_timeline_reset']; + $menu_timeline_reset = (bool)$request['menu_timeline_reset']; $enabled_timelines = []; foreach ($enable as $code => $enabled) { @@ -152,7 +157,16 @@ class Display extends BaseSettings $this->pConfig->set($uid, 'system', 'preview_mode', $preview_mode); $this->pConfig->set($uid, 'system', 'embed_remote_media', $embed_remote_media); $this->pConfig->set($uid, 'system', 'embed_media', $embed_media); - + if ($widget_timeline_reset) { + $this->pConfig->delete($uid, 'system', 'widget_timeline_order'); + } else { + $this->pConfig->set($uid, 'system', 'widget_timeline_order', $widget_timelineorder); + } + if ($menu_timeline_reset) { + $this->pConfig->delete($uid, 'system', 'menu_timeline_order'); + } else { + $this->pConfig->set($uid, 'system', 'menu_timeline_order', $menu_timelineorder); + } $this->pConfig->set($uid, 'system', 'network_timelines', $network_timelines); $this->pConfig->set($uid, 'system', 'enabled_timelines', $enabled_timelines); $this->pConfig->set($uid, 'channel', 'languages', $channel_languages); @@ -259,12 +273,13 @@ class Display extends BaseSettings ContactSelector::SVG_WHITE => $this->t('White'), ]; - $preview_mode = $this->pConfig->get($uid, 'system', 'preview_mode', BBCode::PREVIEW_LARGE); + $preview_mode = $this->pConfig->get($uid, 'system', 'preview_mode', BBCode::PREVIEW_AUTO); $preview_modes = [ BBCode::PREVIEW_NONE => $this->t('No preview'), BBCode::PREVIEW_NO_IMAGE => $this->t('No image'), BBCode::PREVIEW_SMALL => $this->t('Small Image'), BBCode::PREVIEW_LARGE => $this->t('Large Image'), + BBCode::PREVIEW_AUTO => $this->t('Automatic image size'), ]; $bookmarked_timelines = $this->pConfig->get($uid, 'system', 'network_timelines', $this->getAvailableTimelines($uid, true)->column('code')); @@ -275,12 +290,77 @@ class Display extends BaseSettings $timelines = []; foreach ($this->getAvailableTimelines($uid) as $timeline) { $timelines[] = [ - 'label' => $timeline->label, - 'description' => $timeline->description, - 'enable' => ["enable[{$timeline->code}]", '', in_array($timeline->code, $enabled_timelines)], - 'bookmark' => ["bookmark[{$timeline->code}]", '', in_array($timeline->code, $bookmarked_timelines)], + 'enable' => ["enable[{$timeline->code}]", $timeline->label, in_array($timeline->code, $enabled_timelines), $timeline->description], + 'bookmark' => ["bookmark[{$timeline->code}]", $timeline->label, in_array($timeline->code, $bookmarked_timelines), $timeline->description], ]; } + /* GET CUSTOM TIMELINE ORDERS IF ANY + ================================= + First we see if there is a custom order saved in user prefs, if there is we set working array to that. + If we have an array create a temporary array with the items in the correct order. + Lastly we modify the $timelines array with our new order for "enable", "bookmark", or both. + */ + $widget_timeline_order = json_decode($this->pConfig->get($uid, 'system', 'widget_timeline_order')); + $menu_timeline_order = json_decode($this->pConfig->get($uid, 'system', 'menu_timeline_order')); + $temp_widget_order = []; + $temp_menu_order = []; + // do the sidebar widget order first... + if (!empty($widget_timeline_order)) { + $tmp = []; + $xtr = []; + foreach ($widget_timeline_order as $order) { + foreach ($timelines as $timeline) { + $name = str_replace(['enable[',']'], '', $timeline['enable'][0]); + if ($name == $order) { + $tmp[]['enable'] = $timeline['enable']; + } + } + } + // there could be custom or add-on channels not in our array, append those + foreach ($timelines as $timeline) { + $name = str_replace(['enable[',']'], '', $timeline['enable'][0]); + if (!in_array($name, $widget_timeline_order)) { + $xtr[]['enable'] = $timeline['enable']; + } + } + // combine our two temp arrays into one big temp array + $temp_widget_order = array_merge($tmp, $xtr); + } + // do the top menu order next... + if (!empty($menu_timeline_order)) { + $tmp = []; + $xtr = []; + foreach ($menu_timeline_order as $order) { + foreach ($timelines as $timeline) { + $name = str_replace(['bookmark[',']'], '', $timeline['bookmark'][0]); + if ($name == $order) { + $tmp[]['bookmark'] = $timeline['bookmark']; + } + } + } + // there could be custom or add-on channels unaccounted for in our array, append them + foreach ($timelines as $timeline) { + $name = str_replace(['bookmark[',']'], '', $timeline['bookmark'][0]); + if (!in_array($name, $menu_timeline_order)) { + $xtr[]['bookmark'] = $timeline['bookmark']; + } + } + // combine our two temp arrays into one big temp array + $temp_menu_order = array_merge($tmp, $xtr); + } + /* now we need to alter the original timelines array directly... + in theory populated temp arrays should be same length as timelines + */ + for ($t = 0; $t < count($timelines);$t++) { + // only mod from populated widget array + if (count($temp_widget_order) > 0) { + $timelines[$t]['enable'] = $temp_widget_order[$t]['enable']; + } + // only mod from populated menu array + if (count($temp_menu_order) > 0) { + $timelines[$t]['bookmark'] = $temp_menu_order[$t]['bookmark']; + } + } $first_day_of_week = $this->pConfig->get($uid, 'calendar', 'first_day_of_week', 0); $weekdays = [ @@ -309,21 +389,31 @@ class Display extends BaseSettings $tpl = Renderer::getMarkupTemplate('settings/display.tpl'); return Renderer::replaceMacros($tpl, [ - '$ptitle' => $this->t('Display Settings'), - '$submit' => $this->t('Save Settings'), - '$d_tset' => $this->t('General Theme Settings'), - '$d_ctset' => $this->t('Custom Theme Settings'), - '$d_cset' => $this->t('Content Settings'), - '$stitle' => $this->t('Theme settings'), - '$timeline_title' => $this->t('Timelines'), - '$channel_title' => $this->t('Channels'), - '$calendar_title' => $this->t('Calendar'), + '$ptitle' => $this->t('Display Settings'), + '$submit' => $this->t('Save Settings'), + '$d_cset' => $this->t('Content Settings'), + '$stitle' => $this->t('Theme settings'), + '$themes_title' => $this->t('Themes'), + '$themes_settings_for' => $this->t('Settings for %s', Strings::ucFirst($theme_selected)), + '$theme_changed_text' => $this->t('Note: If you switch the theme, you need to save changes before you can see the settings for the new theme below.'), + '$timeline_title' => $this->t('Timelines'), + '$channel_title' => $this->t('Channels'), + '$calendar_title' => $this->t('Calendar'), + '$sortable' => $this->t('Drag to reorder or tab to item with keyboard and move up/down with arrow keys'), + '$reset_widget' => [ + '0' => 'widget_timeline_reset', + '1' => $this->t('Reset order') + ], + '$reset_menu' => [ + '0' => 'menu_timeline_reset', + '1' => $this->t('Reset order') + ], '$form_security_token' => self::getFormSecurityToken('settings_display'), '$uid' => $uid, - '$theme' => ['theme', $this->t('Display Theme:'), $theme_selected, '', $themes, true], - '$mobile_theme' => ['mobile_theme', $this->t('Mobile Theme:'), $mobile_theme_selected, '', $mobile_themes, false], + '$theme' => ['theme', $this->t('Display theme'), $theme_selected, '', $themes, true], + '$mobile_theme' => ['mobile_theme', $this->t('Mobile theme'), $mobile_theme_selected, '', $mobile_themes, false], '$theme_config' => $theme_config, '$itemspage_network' => ['itemspage_network', $this->t('Number of items to display per page:'), $itemspage_network, $this->t('Maximum of 100 items')], @@ -346,8 +436,8 @@ class Display extends BaseSettings '$timeline_label' => $this->t('Label'), '$timeline_descriptiom' => $this->t('Description'), - '$timeline_enable' => $this->t('Enable'), - '$timeline_bookmark' => $this->t('Bookmark'), + '$timeline_enable' => $this->t('Channels Widget'), + '$timeline_bookmark' => $this->t('Top Menu'), '$timelines' => $timelines, '$timeline_explanation' => $this->t('Enable timelines that you want to see in the channels widget. Bookmark timelines that you want to see in the top menu.'), diff --git a/src/Module/Settings/Features.php b/src/Module/Settings/Features.php index 3c8d6ba5df..6cc388428e 100644 --- a/src/Module/Settings/Features.php +++ b/src/Module/Settings/Features.php @@ -8,6 +8,7 @@ namespace Friendica\Module\Settings; use Friendica\App; +use Friendica\Content\Conversation; use Friendica\Content\Feature; use Friendica\Core\L10n; use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues; @@ -35,7 +36,14 @@ class Features extends BaseSettings BaseSettings::checkFormSecurityTokenRedirectOnError('/settings/features', 'settings_features'); foreach ($request as $k => $v) { if (strpos($k, 'feature_') === 0) { - $this->pConfig->set($this->session->getLocalUserId(), 'feature', substr($k, 8), (bool)$v); + $key = substr($k, 8); + if ($key == 'widgetorder') { // not boolean, stringified array + $this->pConfig->set($this->session->getLocalUserId(), 'feature', 'widgetorder', $v); + } elseif ($key == 'resetorder' && $v) { + $this->pConfig->delete($this->session->getLocalUserId(), 'feature', 'widgetorder'); + } else { + $this->pConfig->set($this->session->getLocalUserId(), 'feature', $key, $v); + } } } } @@ -52,13 +60,34 @@ class Features extends BaseSettings $arr[$name][1][] = ['feature_' . $f[0], $f[1], Feature::isEnabled($this->session->getLocalUserId(), $f[0]), $f[2]]; } } + // try to get widget order preference + $widgetorder = json_decode($this->pConfig->get($this->session->getLocalUserId(), 'feature', 'widgetorder')); + if (!empty($widgetorder)) { + $tmp = []; + // iterate through widgetorder and network items + foreach ($widgetorder as $widget) { + foreach ($arr['network'][1] as $list_item) { + if ($list_item[0] == 'feature_'.$widget) { + $tmp[] = $list_item; + } + } + } + // replace network order with temp array order + $arr['network'][1] = $tmp; + }; $tpl = Renderer::getMarkupTemplate('settings/features.tpl'); return Renderer::replaceMacros($tpl, [ '$form_security_token' => BaseSettings::getFormSecurityToken('settings_features'), '$title' => $this->t('Additional Features'), - '$features' => $arr, - '$submit' => $this->t('Save Settings'), + '$sortable' => $this->t('Drag to reorder or tab to item with keyboard and move up/down with arrow keys'), + '$network_mode' => Conversation::MODE_NETWORK, + '$reset' => [ + '0' => 'feature_resetorder', + '1' => $this->t('Reset order') + ], + '$features' => $arr, + '$submit' => $this->t('Save Settings'), ]); } } diff --git a/src/Network/HTTPClient/Client/HttpClientAccept.php b/src/Network/HTTPClient/Client/HttpClientAccept.php index 2432633032..743ceb2fe2 100644 --- a/src/Network/HTTPClient/Client/HttpClientAccept.php +++ b/src/Network/HTTPClient/Client/HttpClientAccept.php @@ -32,4 +32,5 @@ class HttpClientAccept public const VIDEO = 'video/mp4,video/*;q=0.9,*/*;q=0.8'; public const XRD_XML = 'application/xrd+xml,text/xml;q=0.9,*/*;q=0.8'; public const XML = 'application/xml,text/xml;q=0.9,*/*;q=0.8'; + public const HLS = 'application/vnd.apple.mpegurl,application/x-mpegURL;q=0.9,*/*;q=0.8'; } diff --git a/src/Object/Post.php b/src/Object/Post.php index 390a466c0b..1a4e1f57de 100644 --- a/src/Object/Post.php +++ b/src/Object/Post.php @@ -216,6 +216,10 @@ class Post $announceable = false; } + if ($item['restrictions'] & Item::CANT_QUOTE) { + $shareable = false; + } + $edpost = false; if (DI::userSession()->getLocalUserId()) { diff --git a/src/Protocol/ActivityPub.php b/src/Protocol/ActivityPub.php index 405d230341..69b4eaa022 100644 --- a/src/Protocol/ActivityPub.php +++ b/src/Protocol/ActivityPub.php @@ -50,15 +50,38 @@ class ActivityPub const CONTEXT = [ 'https://www.w3.org/ns/activitystreams', 'https://w3id.org/security/v1', [ - 'ostatus' => 'http://ostatus.org#', - 'vcard' => 'http://www.w3.org/2006/vcard/ns#', - 'dfrn' => 'http://purl.org/macgirvin/dfrn/1.0/', - 'diaspora' => 'https://diasporafoundation.org/ns/', - 'litepub' => 'http://litepub.social/ns#', - 'toot' => 'http://joinmastodon.org/ns#', + 'ostatus' => 'http://ostatus.org#', + 'vcard' => 'http://www.w3.org/2006/vcard/ns#', + 'dfrn' => 'http://purl.org/macgirvin/dfrn/1.0/', + 'diaspora' => 'https://diasporafoundation.org/ns/', + 'litepub' => 'http://litepub.social/ns#', + 'toot' => 'http://joinmastodon.org/ns#', + 'quote' => 'https://w3id.org/fep/044f#quote', + 'quoteUri' => 'http://fedibird.com/ns#quoteUri', + 'quoteAuthorization' => [ + '@id' => 'https://w3id.org/fep/044f#quoteAuthorization', + '@type' => '@id', + ], + 'gts' => 'https://gotosocial.org/ns#', + 'interactionPolicy' => [ + '@id' => 'gts:interactionPolicy', + '@type' => '@id', + ], + 'canQuote' => [ + '@id' => 'gts:canQuote', + '@type' => '@id', + ], + 'automaticApproval' => [ + '@id' => 'gts:automaticApproval', + '@type' => '@id', + ], + 'manualApproval' => [ + '@id' => 'gts:manualApproval', + '@type' => '@id', + ], 'featured' => [ - "@id" => "toot:featured", - "@type" => "@id", + "@id" => 'toot:featured', + "@type" => '@id', ], 'schema' => 'http://schema.org#', 'manuallyApprovesFollowers' => 'as:manuallyApprovesFollowers', @@ -191,10 +214,11 @@ class ActivityPub * * @param string $url * @param integer $uid User ID + * @param integer $max Maximum number of activities to fetch (0 = all) * @return void * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function fetchOutbox(string $url, int $uid) + public static function fetchOutbox(string $url, int $uid, int $max = 0) { $data = HTTPSignature::fetch($url, $uid); if (empty($data)) { @@ -212,9 +236,14 @@ class ActivityPub $items = []; } + $count = 0; foreach ($items as $activity) { $ldactivity = JsonLD::compact($activity); ActivityPub\Receiver::processActivity($ldactivity, '', $uid, true); + if ($max > 0 && ++$count >= $max) { + DI::logger()->info('Reached maximum number of activities to fetch', ['url' => $url, 'uid' => $uid, 'max' => $max]); + return; + } } } @@ -250,6 +279,8 @@ class ActivityPub $items = $data['first']['items']; } elseif (!empty($data['first']) && is_string($data['first']) && ($data['first'] != $url)) { return self::fetchItems($data['first'], $uid, $start_timestamp); + } elseif (isset($data['first']) && isset($data['first']['next']) && ($data['first']['next'] != $url)) { + return self::fetchItems($data['first']['next'], $uid, $start_timestamp); } else { return []; } diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php index e714a1d9c1..e9a721b5db 100644 --- a/src/Protocol/ActivityPub/Processor.php +++ b/src/Protocol/ActivityPub/Processor.php @@ -46,6 +46,11 @@ class Processor const CACHEKEY_FETCH_ACTIVITY = 'processor:fetchMissingActivity:'; const CACHEKEY_JUST_FETCHED = 'processor:isJustFetched:'; + const FETCH_REPLIES_ALL = 0; + const FETCH_REPLIES_NONE = 1; + const FETCH_REPLIES_FOLLOWED = 2; + const FETCH_REPLIES_INTERACTION = 3; + /** * Add an object id to the list of processed ids * @@ -158,6 +163,10 @@ class Processor $data['player-url'] = $attachment['player-url'] ?? null; $data['player-height'] = $attachment['player-height'] ?? null; $data['player-width'] = $attachment['player-width'] ?? null; + $data['embed-type'] = $attachment['embed-type'] ?? null; + $data['embed-html'] = $attachment['embed-html'] ?? null; + $data['embed-width'] = $attachment['embed-width'] ?? null; + $data['embed-height'] = $attachment['embed-height'] ?? null; Post\Media::insert($data); } @@ -256,7 +265,62 @@ class Processor self::updateEvent($post['event-id'], $activity); } } - self::processReplies($activity, $item); + + if (self::shouldCompleteThread($item)) { + if (Worker::isInWorkerMode()) { + self::processReplies($activity, $item); + } else { + Worker::add(Worker::PRIORITY_MEDIUM, 'FetchMissingReplies', $item['uri-id'], $activity); + } + } + } + + private static function shouldCompleteThread(array $item): bool + { + switch (DI::config()->get('system', 'fetch_replies')) { + case self::FETCH_REPLIES_ALL: + DI::logger()->debug('Fetch all replies is enabled'); + return true; + + case self::FETCH_REPLIES_FOLLOWED: + DI::logger()->debug('Fetch replies from followed users is enabled'); + return Post::exists(["`parent-uri-id` = ? AND `gravity` IN (?, ?) AND `uid` != ?", $item['parent-uri-id'], Item::GRAVITY_PARENT, Item::GRAVITY_COMMENT, 0]); + + case self::FETCH_REPLIES_INTERACTION: + DI::logger()->debug('Fetch replies with interaction is enabled'); + return Post::exists(["`parent-uri-id` = ? AND `origin`", $item['parent-uri-id']]); + } + + DI::logger()->debug('No reply fetching is enabled'); + return false; + } + + /** + * Fetch replies for a given uri id + * + * @param int $uriId Uri-id of the parent item + * @param array $child Child activity data + */ + public static function fetchRepliesByUriId(int $uriId, array $child = []) + { + $item = Post::selectFirstPost(['thr-parent', 'parent-uri', 'replies'], ['uri-id' => $uriId, 'private' => [Item::PUBLIC, Item::UNLISTED]]); + if (!$item) { + return; + } + + if (!$child) { + $activity = DBA::selectFirst('post-activity', [], ['uri-id' => $uriId]); + $data = json_decode($activity['activity'] ?? '', true); + if ($data) { + $activity = JsonLD::compact($data); + + $trust_source = true; + $child = Receiver::prepareObjectData($activity, 0, false, $trust_source); + } + } + + DI::logger()->debug('Process replies', ['uri-id' => $uriId, 'replies' => !$item['replies']]); + self::processReplies($child, $item); } /** @@ -516,29 +580,28 @@ class Processor private static function processReplies(array $activity, array $item) { - // @todo fetch replies not only in the decoupled mode - if (!DI::config()->get('system', 'decoupled_receiver')) { + if (isset($item['parent-uri-id'])) { + $condition = ['parent-uri-id' => $item['parent-uri-id']]; + } elseif (isset($item['thr-parent-id'])) { + $parent = Post::selectFirstPost(['parent-uri-id'], ['uri-id' => $item['thr-parent-id']]); + if (isset($parent['parent-uri-id'])) { + $condition = ['parent-uri-id' => $parent['parent-uri-id']]; + } else { + $condition = ['uri-id' => [$item['thr-parent-id'], $item['uri-id']]]; + } + } elseif (isset($item['replies'])) { + self::fetchReplies($item['replies'], $activity); + return; + } else { return; } - $replies = [$item['thr-parent']]; - if (!empty($item['parent-uri'])) { - $replies[] = $item['parent-uri']; - } - $condition = DBA::mergeConditions(['uri' => $replies], ["`replies-id` IS NOT NULL"]); + $condition = DBA::mergeConditions($condition, ["`replies-id` IS NOT NULL"]); $posts = Post::select(['replies', 'replies-id'], $condition); while ($post = Post::fetch($posts)) { - $cachekey = 'Processor-CreateItem-Replies-' . $post['replies-id']; - if (!DI::cache()->get($cachekey)) { - self::fetchReplies($post['replies'], $activity); - DI::cache()->set($cachekey, true); - } - } - DBA::close($replies); - - if (!empty($item['replies'])) { - self::fetchReplies($item['replies'], $activity); + self::fetchReplies($post['replies'], $activity); } + DBA::close($posts); } /** @@ -960,30 +1023,10 @@ class Processor self::storeReceivers($item['uri-id'], $activity['receiver_urls'] ?? []); - if (!empty($activity['capabilities'])) { - $restrictions = self::storeCapabilities($item['uri-id'], $activity['capabilities']); - } elseif (!is_null($activity['can-comment']) && !$activity['can-comment']) { - $restrictions = [Tag::CAN_REPLY]; - } else { - $restrictions = []; - } - - $item['restrictions'] = null; - foreach ($restrictions as $restriction) { - if ($restriction == Tag::CAN_REPLY) { - $item['restrictions'] = $item['restrictions'] | Item::CANT_REPLY; - } elseif ($restriction == Tag::CAN_LIKE) { - $item['restrictions'] = $item['restrictions'] | Item::CANT_LIKE; - } elseif ($restriction == Tag::CAN_ANNOUNCE) { - $item['restrictions'] = $item['restrictions'] | Item::CANT_ANNOUNCE; - } - } - - if (!empty($item['author-id'])) { - $author = Contact::selectFirstAccount(['ap-posting-restricted'], ['id' => $item['author-id']]); - if (!empty($author['ap-posting-restricted'])) { - $item['restrictions'] = $item['restrictions'] | Item::CANT_REPLY; - } + if (!empty($activity['interaction'])) { + self::storeInteractions($item['uri-id'], $activity['interaction']); + } elseif (!empty($activity['capabilities'])) { + self::storeCapabilities($item['uri-id'], $activity['capabilities'], $item['author-id']); } $item['location'] = $activity['location']; @@ -1262,8 +1305,12 @@ class Processor } } - if ($success) { - self::processReplies($activity, $item); + if ($success && self::shouldCompleteThread($item)) { + if (Worker::isInWorkerMode()) { + self::processReplies($activity, $item); + } else { + Worker::add(Worker::PRIORITY_MEDIUM, 'FetchMissingReplies', $item['uri-id'], $activity); + } } } @@ -1355,7 +1402,7 @@ class Processor * @param integer $uriid * @param array $tags */ - private static function storeTags(int $uriid, array $tags = null) + private static function storeTags(int $uriid, ?array $tags = null) { foreach ($tags as $tag) { if (empty($tag['name']) || empty($tag['type']) || !in_array($tag['type'], ['Mention', 'Hashtag'])) { @@ -1416,16 +1463,90 @@ class Processor } } - private static function storeCapabilities(int $uriid, array $capabilities): array + public static function getRestrictions(int $uriid, int $author_id, int $uid): ?int + { + $author = Contact::getAccountById($author_id, ['ap-following', 'ap-followers', 'ap-posting-restricted']); + if ($author['ap-posting-restricted']) { + return Item::CANT_REPLY; + } + + $tags = Tag::getByURIId($uriid, [Tag::CAN_ANNOUNCE, Tag::CAN_LIKE, Tag::CAN_REPLY, Tag::CAN_QUOTE]); + if (!is_array($tags) || sizeof($tags) == 0) { + return null; + } + + $restrictions = 0; + foreach ($tags as $tag) { + if ($tag['url'] == ActivityPub::PUBLIC_COLLECTION) { + continue; + } + + if ($uid != 0) { + if (User::getIdForURL($tag['url']) == $uid) { + continue; + } + if ($tag['url'] == $author['ap-following'] && Contact::isSharing($author_id, $uid, true)) { + continue; + } + if ($tag['url'] == $author['ap-followers'] && Contact::isFollower($author_id, $uid, true)) { + continue; + } + } + if ($tag['type'] == Tag::CAN_REPLY) { + $restrictions = $restrictions | Item::CANT_REPLY; + } elseif ($tag['type'] == Tag::CAN_LIKE) { + $restrictions = $restrictions | Item::CANT_LIKE; + } elseif ($tag['type'] == Tag::CAN_ANNOUNCE) { + $restrictions = $restrictions | Item::CANT_ANNOUNCE; + } elseif ($tag['type'] == Tag::CAN_QUOTE) { + $restrictions = $restrictions | Item::CANT_QUOTE; + } + } + DI::logger()->debug('Calculated restrictions', ['uri-id' => $uriid, 'author-id' => $author_id, 'uid' => $uid, 'restrictions' => $restrictions]); + return $restrictions; + } + + private static function storeInteractions(int $uriid, array $interactions) + { + foreach ($interactions as $key => $key_interaction) { + foreach ($key_interaction as $interaction) { + if ($interaction == ActivityPub::PUBLIC_COLLECTION) { + $name = Receiver::PUBLIC_COLLECTION; + } elseif ($path = parse_url($interaction, PHP_URL_PATH)) { + $name = trim($path, '/'); + } elseif ($host = parse_url($interaction, PHP_URL_HOST)) { + $name = $host; + } else { + DI::logger()->warning('Unable to coerce name from interaction', ['key' => $key, 'interaction' => $interaction]); + $name = ''; + } + DI::logger()->debug('Storing interaction', ['uri-id' => $uriid, 'key' => $key, 'name' => $name, 'interaction' => $interaction]); + Tag::store($uriid, $key, $name, $interaction); + } + } + } + + private static function storeCapabilities(int $uriid, array $capabilities, int $author_id) { - $restrictions = []; foreach (['pixelfed:canAnnounce' => Tag::CAN_ANNOUNCE, 'pixelfed:canLike' => Tag::CAN_LIKE, 'pixelfed:canReply' => Tag::CAN_REPLY] as $element => $type) { - $restricted = true; + if (!isset($capabilities[$element])) { + $author = Contact::getAccountById($author_id, ['nick', 'url']); + if (!$author) { + continue; + } + Tag::store($uriid, $type, $author['nick'] ?: $author['url'], $author['url']); + continue; + } foreach ($capabilities[$element] ?? [] as $capability) { if ($capability == ActivityPub::PUBLIC_COLLECTION) { $name = Receiver::PUBLIC_COLLECTION; } elseif (empty($capability) || ($capability == '[]')) { - continue; + $author = Contact::getAccountById($author_id, ['nick', 'url']); + if (!$author) { + continue; + } + $name = $author['nick'] ?: $author['url']; + $capability = $author['url']; } elseif ($path = parse_url($capability, PHP_URL_PATH)) { $name = trim($path, '/'); } elseif ($host = parse_url($capability, PHP_URL_HOST)) { @@ -1434,14 +1555,9 @@ class Processor DI::logger()->warning('Unable to coerce name from capability', ['element' => $element, 'type' => $type, 'capability' => $capability]); $name = ''; } - $restricted = false; Tag::store($uriid, $type, $name, $capability); } - if ($restricted) { - $restrictions[] = $type; - } } - return $restrictions; } /** @@ -1797,6 +1913,16 @@ class Processor private static function fetchReplies(string $url, array $child) { + if (DI::baseUrl()->isLocalUrl($url)) { + return; + } + + if (self::isFetched($url)) { + DI::logger()->debug('Url is already processed', ['url' => $url]); + return; + } + self::addActivityId($url); + $callstack_count = 0; foreach ($child['callstack'] ?? [] as $function) { if ($function == __FUNCTION__) { @@ -1850,6 +1976,7 @@ class Processor $id = $reply; } if (!self::alreadyKnown($id, $child['id'] ?? '')) { + DI::logger()->debug('Fetch missing activity', ['url' => $url, 'id' => $id]); self::fetchMissingActivity($id, $child, '', Receiver::COMPLETION_REPLIES); ++$fetched; } @@ -2127,6 +2254,46 @@ class Processor Queue::remove($activity); } + /** + * process a "quote" request + * + * @param array $activity + * @return void + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException + */ + public static function processQuoteRequest(array $activity) + { + if (!($post = Post::selectFirst(['author-link', 'uid'], ['uri' => $activity['object_id'], 'origin' => true, 'private' => [Item::PUBLIC, Item::UNLISTED]]))) { + DI::logger()->info('Quoted post not found locally or it is not public', ['uri' => $activity['object_id']]); + Queue::remove($activity); + return; + } + if (!($contact = Contact::getByURL($activity['actor'], null, ['url']))) { + DI::logger()->info('Actor is not a known contact', ['actor' => $activity['actor']]); + return; + } + + $owner = User::getOwnerDataById($post['uid']); + if (!DBA::isResult($owner)) { + return; + } + + $quote = Post::selectFirst(['guid'], ['uri' => $activity['target_id']]); + if (!isset($quote['guid'])) { + if (Processor::fetchMissingActivity($activity['target_id'], $activity, '', Receiver::COMPLETION_ANNOUNCE)) { + $quote = Post::selectFirst(['guid'], ['uri' => $activity['target_id']]); + } + } + if (!isset($quote['guid'])) { + DI::logger()->debug('Remote quote was not found', ['uri' => $activity['target_id']]); + return; + } + + ActivityPub\Transmitter::acceptQuoteRequest($contact['url'], $activity['target_id'], $quote['guid'], $post['author-link'], $activity['object_id'], $activity['id'], $owner); + Queue::remove($activity); + } + /** * Transmit pending events to the new follower * diff --git a/src/Protocol/ActivityPub/Receiver.php b/src/Protocol/ActivityPub/Receiver.php index 399d74cd63..a807a74955 100644 --- a/src/Protocol/ActivityPub/Receiver.php +++ b/src/Protocol/ActivityPub/Receiver.php @@ -20,6 +20,7 @@ use Friendica\Model\Contact; use Friendica\Model\APContact; use Friendica\Model\Item; use Friendica\Model\Post; +use Friendica\Model\Tag; use Friendica\Model\User; use Friendica\Protocol\Activity; use Friendica\Protocol\ActivityPub; @@ -453,6 +454,13 @@ class Receiver $object_data['object_id'] = JsonLD::fetchElement($activity, 'as:object', '@id'); $object_data['object_type'] = JsonLD::fetchElement($activity['as:object'], '@type'); $object_data['object_content'] = JsonLD::fetchElement($activity['as:object'], 'as:content', '@type'); + } elseif (in_array($type, ['quote:QuoteRequest'])) { + $object_data = []; + + $object_data['id'] = JsonLD::fetchElement($activity, '@id'); + $object_data['target_id'] = JsonLD::fetchElement($activity, 'as:instrument', '@id', '@type', 'as:Note'); + $object_data['object_id'] = JsonLD::fetchElement($activity, 'as:object', '@id'); + $object_data['object_type'] = JsonLD::fetchElement($activity['as:object'], '@type'); } else { $object_data = []; @@ -611,7 +619,7 @@ class Receiver * @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \ImagickException */ - public static function processActivity(array $activity, string $body = '', int $uid = null, bool $trust_source = false, bool $push = false, array $signer = [], string $http_signer = '', int $completion = Receiver::COMPLETION_AUTO): bool + public static function processActivity(array $activity, string $body = '', ?int $uid = null, bool $trust_source = false, bool $push = false, array $signer = [], string $http_signer = '', int $completion = Receiver::COMPLETION_AUTO): bool { $type = JsonLD::fetchElement($activity, '@type'); if (!$type) { @@ -1055,6 +1063,10 @@ class Receiver } break; + case 'quote:QuoteRequest': + ActivityPub\Processor::processQuoteRequest($object_data); + break; + default: DI::logger()->info('Unknown activity: ' . $type . ' ' . $object_data['object_type']); return false; @@ -1076,7 +1088,7 @@ class Receiver * @param array $signer The signer of the post * @return void */ - private static function storeUnhandledActivity(bool $unknown, string $type, array $object_data, array $activity, string $body = '', int $uid = null, bool $trust_source = false, bool $push = false, array $signer = []) + private static function storeUnhandledActivity(bool $unknown, string $type, array $object_data, array $activity, string $body = '', ?int $uid = null, bool $trust_source = false, bool $push = false, array $signer = []) { if (!DI::config()->get('debug', 'ap_log_unknown')) { return; @@ -1867,9 +1879,10 @@ class Receiver * @param array $urls The object URL list * @param string|null $icon The icon URL to use for the attachments * @param array $player Embedded player data (url, width, height) + * @param array $embed oEmbed data (html, width, height) * @return array an array of attachments */ - private static function processAttachmentUrls(array $urls, ?string $icon, array $player): array + private static function processAttachmentUrls(array $urls, ?string $icon, array $player, array $embed): array { $attachments = []; foreach ($urls as $key => $url) { @@ -1893,13 +1906,14 @@ class Receiver } $filetype = strtolower(substr($mediatype, 0, strpos($mediatype, '/'))); + $type = Post\Media::getType($mediatype); $height = JsonLD::fetchElement($url, 'as:height', '@value'); $width = JsonLD::fetchElement($url, 'as:width', '@value'); - if ($filetype == 'audio') { + if ($type == Post\Media::AUDIO) { $attachments[] = ['type' => $filetype, 'mediaType' => $mediatype, 'url' => $href, 'height' => $height, 'width' => $width, 'size' => null, 'name' => '', 'image' => $icon]; - } elseif ($filetype == 'video') { + } elseif ($type == Post\Media::VIDEO) { // PeerTube audio-only track if (!$height) { continue; @@ -1908,40 +1922,33 @@ class Receiver $size = (int)JsonLD::fetchElement($url, 'pt:size', '@value'); $attachments[] = ['type' => $filetype, 'mediaType' => $mediatype, 'url' => $href, 'height' => $height, 'width' => $width, 'size' => $size, 'name' => '', 'image' => $icon]; - } elseif (in_array($mediatype, ['application/x-bittorrent', 'application/x-bittorrent;x-scheme-handler/magnet'])) { + } elseif ($type == Post\Media::TORRENT) { // For Torrent links we always store the highest resolution if (!empty($attachments[$mediatype]['height']) && ($height < $attachments[$mediatype]['height'])) { continue; } $attachments[$mediatype] = ['type' => $mediatype, 'mediaType' => $mediatype, 'url' => $href, 'height' => $height, 'width' => $width, 'size' => null, 'name' => '']; - } elseif ($mediatype == 'application/x-mpegURL') { - // PeerTube uses HLS streams for video. We prefer HLS streams over the video file itself. - // But we still store the video file as an attachment to be used by the API which currently does not support HLS streams. - $attachments = array_merge($attachments, self::processAttachmentUrls($url['as:tag'], $icon, [])); - + } elseif ($type == Post\Media::HLS) { $attachment = ['type' => $filetype, 'mediaType' => $mediatype, 'url' => $href, 'height' => $height, 'width' => $width, 'size' => null, 'name' => '', 'image' => $icon]; - if (!empty($player)) { + if (is_array($player)) { $attachment['player-url'] = $player['embed'] ?? null; $attachment['player-height'] = $player['height'] ?? null; $attachment['player-width'] = $player['width'] ?? null; - if (is_null($attachment['player-height']) && is_null($attachment['player-width'])) { - foreach ($attachments as $media) { - if (isset($media['height']) && isset($media['width'])) { - if ($media['height'] > $attachment['player-height'] || $media['width'] > $attachment['player-width']) { - $attachment['player-height'] = $media['height']; - $attachment['player-width'] = $media['width']; - } - } - } - } - if (!$height && !$width) { $attachment['height'] = $attachment['player-height']; $attachment['width'] = $attachment['player-width']; } } + + if (is_array($embed)) { + $attachment['embed-type'] = $embed['type'] ?? null; + $attachment['embed-html'] = $embed['html'] ?? null; + $attachment['embed-height'] = $embed['height'] ?? null; + $attachment['embed-width'] = $embed['width'] ?? null; + } + DI::logger()->info('Adding video attachment', ['attachment' => $attachment]); $attachments[] = $attachment; } @@ -1986,6 +1993,10 @@ class Receiver } } + if (!empty($object['gts:interactionPolicy'])) { + $object_data['interaction'] = self::getinteractionPolicy($object['gts:interactionPolicy']); + } + if (!empty($object['pixelfed:capabilities'])) { $object_data['capabilities'] = self::getCapabilities($object); } @@ -1993,6 +2004,34 @@ class Receiver return $object_data; } + /** + * Import GoToSocial's interaction policx + * @see https://docs.gotosocial.org/en/latest/federation/interaction_policy/ + * + * @param array $object + * @return array + */ + private static function getinteractionPolicy(array $object): array + { + $interactions = []; + foreach ([Tag::CAN_ANNOUNCE => 'gts:canAnnounce', Tag::CAN_LIKE => 'gts:canLike', Tag::CAN_REPLY => 'gts:canReply', Tag::CAN_QUOTE => 'gts:canQuote'] as $key => $element) { + foreach (['gts:automaticApproval', 'gts:manualApproval'] as $approval) { + if (!isset($object[$element][$approval])) { + continue; + } + $interaction = JsonLD::fetchElement($object[$element][$approval], '@id'); + if (empty($interaction)) { + continue; + } + if ($interaction == self::PUBLIC_COLLECTION) { + $interaction = ActivityPub::PUBLIC_COLLECTION; + } + $interactions[$key][] = $interaction; + } + } + return $interactions; + } + private static function getCapabilities($object) { $capabilities = []; @@ -2001,7 +2040,13 @@ class Receiver if (empty($capabilities_list)) { continue; } - $capabilities[$element] = $capabilities_list; + + foreach ($capabilities_list as $capability) { + if ($capability == self::PUBLIC_COLLECTION) { + $capability = ActivityPub::PUBLIC_COLLECTION; + } + $capabilities[$element][] = $capability; + } } return $capabilities; } @@ -2130,13 +2175,13 @@ class Receiver } else { $player = []; } + if (isset($siteinfo['embed'])) { + $embed = $siteinfo['embed']; + } else { + $embed = []; + } - $object_data['attachments'] = array_merge($object_data['attachments'], self::processAttachmentUrls($object['as:url'] ?? [], self::processIcon($object), $player)); - } - - $object_data['can-comment'] = JsonLD::fetchElement($object, 'pt:commentsEnabled', '@value'); - if (is_null($object_data['can-comment'])) { - $object_data['can-comment'] = JsonLD::fetchElement($object, 'pixelfed:commentsEnabled', '@value'); + $object_data['attachments'] = array_merge($object_data['attachments'], self::processAttachmentUrls($object['as:url'] ?? [], self::processIcon($object), $player, $embed)); } // Support for quoted posts (Pleroma, Fedibird and Misskey) @@ -2153,6 +2198,13 @@ class Receiver if (empty($object_data['quote-url'])) { $object_data['quote-url'] = JsonLD::fetchElement($object, 'misskey:_misskey_quote', '@id'); } + if (empty($object_data['quote-url'])) { + $object_data['quote-url'] = JsonLD::fetchElement($object, 'quote:quote'); + } + + if (!is_null($object_data['quote-url']) && !is_null($object_data['content'])) { + $object_data['content'] = HTML::removeElementByClass($object_data['content'], 'quote-inline'); + } foreach ($object_data['tags'] as $tag) { if (HTTPSignature::isValidContentType($tag['mediaType'] ?? '', $tag['href'] ?? '')) { diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php index 65b45bb3ea..bbfd52e0e4 100644 --- a/src/Protocol/ActivityPub/Transmitter.php +++ b/src/Protocol/ActivityPub/Transmitter.php @@ -1527,9 +1527,9 @@ class Transmitter * * @param array $tags Tag array * @param string $text Text containing tags like :tag: - * @return string normalized text + * @return string|null normalized text or null */ - private static function addEmojiTags(array &$tags, string $text): string + private static function addEmojiTags(array &$tags, string $text): ?string { $emojis = Smilies::extractUsedSmilies($text, $normalized); foreach ($emojis as $name => $url) { @@ -1899,6 +1899,7 @@ class Transmitter $real_quote = true; $data['_misskey_content'] = BBCode::removeSharedData($body); $data['quoteUrl'] = $item['quote-uri']; + $data['quoteUri'] = $item['quote-uri']; $body = DI::contentItem()->addShareLink($body, $item['quote-uri-id']); } else { $body = DI::contentItem()->addSharedPost($item, $body); @@ -1925,6 +1926,10 @@ class Transmitter $richbody = BBCode::replaceAttachment($richbody); $data['contentMap'][$language] = BBCode::convertForUriId($item['uri-id'], $richbody, BBCode::EXTERNAL); + + if ($data['content'] == '') { + $data['content'] = $data['contentMap'][$language]; + } } if (!empty($item['quote-uri-id']) && ($item['quote-uri-id'] != $item['uri-id'])) { @@ -1939,9 +1944,25 @@ class Transmitter $data['diaspora:comment'] = $item['signed_text']; } + // @todo full support of GoToSocial's interaction policy + // @see https://docs.gotosocial.org/en/latest/federation/interaction_policy/ + if ($item['private'] != Item::PRIVATE) { + $data['interactionPolicy'] = [ + 'canQuote' => [ + 'automaticApproval' => [ActivityPub::PUBLIC_COLLECTION] + ] + ]; + } + $data['attachment'] = self::createAttachmentList($item); $data['tag'] = array_merge(self::createTagList($item, $data['quoteUrl'] ?? ''), $emojis); + $data['replies'] = [ + 'id' => $item['uri'] . '/replies', + 'type' => 'Collection', + 'totalItems' => Post::countPosts(['thr-parent-id' => $item['uri-id'], 'gravity' => Item::GRAVITY_COMMENT, 'deleted' => false, 'private' => [Item::PUBLIC, Item::UNLISTED]]) + ]; + if (empty($data['location']) && (!empty($item['coord']) || !empty($item['location']))) { $data['location'] = self::createLocation($item); } @@ -2516,6 +2537,54 @@ class Transmitter return HTTPSignature::transmit($signed, $profile['inbox'], $owner); } + /** + * Accepts a quote request + * + * @param string $remote_actor Remote actor URL + * @param string $remote_quote_id Remote quote ID + * @param string $remote_quote_guid Remote quote guid + * @param string $local_actor Local actor URL + * @param string $local_quote_id Local quote ID + * @param string $request_id Quote request ID + * @param array $owner Sender owner-view record + * @return bool success + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException + * @throws \Exception + */ + public static function acceptQuoteRequest(string $remote_actor, string $remote_quote_id, string $remote_quote_guid, string $local_actor, string $local_quote_id, string $request_id, array $owner): bool + { + $profile = APContact::getByURL($remote_actor); + if (empty($profile['inbox'])) { + DI::logger()->warning('No inbox found for target', ['target' => $remote_actor, 'profile' => $profile]); + return false; + } + + $objectId = DI::baseUrl() . '/activity/' . System::createGUID(); + + $data = [ + '@context' => ActivityPub::CONTEXT, + 'type' => 'Accept', + 'to' => $remote_actor, + 'id' => $objectId, + 'actor' => $local_actor, + 'object' => [ + 'type' => 'QuoteRequest', + 'id' => $request_id, + 'actor' => $remote_actor, + 'object' => $local_quote_id, + 'instrument' => $remote_quote_id, + ], + 'result' => $local_quote_id . '/quote_authorization/' . $remote_quote_guid, + 'instrument' => self::getService(), + ]; + + DI::logger()->info('Accept quote request', ['id' => $request_id, 'quote-id' => $local_quote_id, 'remote-id' => $remote_quote_id, 'actor' => $remote_actor, 'data' => $data]); + + $signed = LDSignature::sign($data, $owner); + return HTTPSignature::transmit($signed, $profile['inbox'], $owner); + } + /** * Prepends mentions (@) to $body variable * diff --git a/src/Protocol/Feed.php b/src/Protocol/Feed.php index 48780e6181..7fc87085a3 100644 --- a/src/Protocol/Feed.php +++ b/src/Protocol/Feed.php @@ -279,8 +279,7 @@ class Feed return []; } - $items = []; - $creation_dates = []; + $items = []; // Limit the number of items that are about to be fetched $total_items = ($entries->length - 1); @@ -289,7 +288,10 @@ class Feed $total_items = $max_items; } - $postings = self::importOlderEntries($entries, $total_items, $header, $author, $contact, $importer, $xpath, $atomns, $basepath, $dryRun); + $processed = self::processEntries($entries, $total_items, $header, $author, $contact, $importer, $xpath, $atomns, $basepath, $dryRun); + + $postings = $processed['postings']; + $creation_dates = $processed['creation_dates']; if (!empty($postings)) { $min_posting = DI::config()->get('system', 'minimum_posting_interval', 0); @@ -358,9 +360,10 @@ class Feed return $title; } - private static function importOlderEntries(DOMNodeList $entries, int $total_items, array $header, array $author, array $contact, array $importer, DOMXPath $xpath, string $atomns, string $basepath, bool $dryRun): array + private static function processEntries(DOMNodeList $entries, int $total_items, array $header, array $author, array $contact, array $importer, DOMXPath $xpath, string $atomns, string $basepath, bool $dryRun): array { - $postings = []; + $postings = []; + $creation_dates = []; // Importing older entries first for ($i = $total_items; $i >= 0; --$i) { @@ -685,29 +688,6 @@ class Feed $taglist = $fetch_further_information == LocalRelationship::FFI_BOTH ? PageInfo::getTagsFromUrl($item['plink'], $preview, $contact['ffi_keyword_denylist'] ?? '') : []; $item['object-type'] = Activity\ObjectType::BOOKMARK; $attachments = []; - - foreach (['audio', 'video'] as $elementname) { - if (!empty($data[$elementname])) { - foreach ($data[$elementname] as $element) { - if (!empty($element['src'])) { - $src = $element['src']; - } elseif (!empty($element['content'])) { - $src = $element['content']; - } else { - continue; - } - - $attachments[] = [ - 'type' => ($elementname == 'audio') ? Post\Media::AUDIO : Post\Media::VIDEO, - 'url' => $src, - 'preview' => $element['image'] ?? null, - 'mimetype' => $element['contenttype'] ?? null, - 'name' => $element['name'] ?? null, - 'description' => $element['description'] ?? null, - ]; - } - } - } } } else { if ($fetch_further_information == LocalRelationship::FFI_KEYWORD) { @@ -762,7 +742,7 @@ class Feed } } - return $postings; + return ['postings' => $postings, 'creation_dates' => $creation_dates]; } /** diff --git a/src/Util/DateTimeFormat.php b/src/Util/DateTimeFormat.php index 830b50a2fe..af26317b46 100644 --- a/src/Util/DateTimeFormat.php +++ b/src/Util/DateTimeFormat.php @@ -121,6 +121,10 @@ class DateTimeFormat $s = 'now'; } + if (is_numeric($s) && ($s > time() * 100)) { + $s = number_format($s / 1000, 0, '.', ''); + } + // Lowest possible datetime value if (substr($s, 0, 10) <= '0001-01-01') { $d = new DateTime('now', new DateTimeZone('UTC')); diff --git a/src/Util/JsonLD.php b/src/Util/JsonLD.php index 676c944381..42c561a120 100644 --- a/src/Util/JsonLD.php +++ b/src/Util/JsonLD.php @@ -60,6 +60,12 @@ class JsonLD case 'https://purl.archive.org/socialweb/webfinger': $url = DI::basePath() . '/static/socialweb-webfinger.jsonld'; break; + case 'https://www.w3.org/ns/cid/v1': + $url = DI::basePath() . '/static/cid-v1.jsonld'; + break; + case 'https://w3id.org/security/data-integrity/v2': + $url = DI::basePath() . '/static/data-integrity-v2.jsonld'; + break; default: switch (parse_url($url, PHP_URL_PATH)) { case '/schemas/litepub-0.1.jsonld': @@ -165,6 +171,8 @@ class JsonLD 'misskey' => (object)['@id' => 'https://misskey-hub.net/ns#', '@type' => '@id'], 'pixelfed' => (object)['@id' => 'http://pixelfed.org/ns#', '@type' => '@id'], 'lemmy' => (object)['@id' => 'https://join-lemmy.org/ns#', '@type' => '@id'], + 'quote' => (object)['@id' => 'https://w3id.org/fep/044f#', '@type' => '@id'], + 'gts' => (object)['@id' => 'https://gotosocial.org/ns#', '@type' => '@id'], ]; $orig_json = $json; diff --git a/src/Util/Network.php b/src/Util/Network.php index 2172c5a177..06689b7c5d 100644 --- a/src/Util/Network.php +++ b/src/Util/Network.php @@ -647,7 +647,7 @@ class Network * @param string|null $uri * @return UriInterface|null */ - public static function createUriFromString(string $uri = null): ?UriInterface + public static function createUriFromString(?string $uri): ?UriInterface { if (empty($uri)) { return null; diff --git a/src/Util/ParseUrl.php b/src/Util/ParseUrl.php index c748c050e6..dfb1e21167 100644 --- a/src/Util/ParseUrl.php +++ b/src/Util/ParseUrl.php @@ -22,6 +22,7 @@ use Friendica\Network\HTTPClient\Client\HttpClientOptions; use Friendica\Network\HTTPClient\Client\HttpClientRequest; use Embera\Embera; use Friendica\Content\Text\BBCode; +use Friendica\Core\Cache\Enum\Duration; use Friendica\Model\Post; /** @@ -459,6 +460,9 @@ class ParseUrl case 'og:description': $siteinfo['text'] = trim($meta_tag['content']); break; + case 'og:updated_time': + $siteinfo['modified'] = DateTimeFormat::utc(trim($meta_tag['content'])); + break; case 'og:site_name': $siteinfo['publisher_name'] = trim($meta_tag['content']); break; @@ -494,16 +498,24 @@ class ParseUrl } } + $siteinfo['schematypes'] = []; + $list = $xpath->query("//script[@type='application/ld+json']"); foreach ($list as $node) { if (!empty($node->nodeValue)) { $jsonld = json_decode($node->nodeValue, true); if (is_array($jsonld)) { - $siteinfo = self::parseParts($siteinfo, $jsonld); + $siteinfo = self::parseParts($siteinfo, $jsonld, true); } } } + $siteinfo['schematypes'] = array_values(array_unique($siteinfo['schematypes'])); + + if (sizeof($siteinfo['schematypes']) === 0) { + unset($siteinfo['schematypes']); + } + $siteinfo = self::getOembedInfo($xpath, $siteinfo); if (!empty($siteinfo['player']['stream'])) { @@ -595,7 +607,7 @@ class ParseUrl foreach (['audio', 'video'] as $element) { if (!empty($siteinfo[$element])) { - array_walk($siteinfo[$element], function (&$media) use ($page_url, &$siteinfo) { + array_walk($siteinfo[$element], function (&$media) use ($page_url) { $url = ''; $embed = ''; $content = ''; @@ -630,9 +642,6 @@ class ParseUrl } if (!empty($embed)) { $media['embed'] = $embed; - if (empty($siteinfo['player']['embed'])) { - $siteinfo['player']['embed'] = $embed; - } } if (!empty($content)) { $media['src'] = $content; @@ -748,16 +757,16 @@ class ParseUrl * * @return array siteinfo */ - private static function parseParts(array $siteinfo, array $jsonld): array + private static function parseParts(array $siteinfo, array $jsonld, bool $root): array { if (!empty($jsonld['@graph']) && is_array($jsonld['@graph'])) { foreach ($jsonld['@graph'] as $part) { if (!empty($part) && is_array($part)) { - $siteinfo = self::parseParts($siteinfo, $part); + $siteinfo = self::parseParts($siteinfo, $part, false); } } } elseif (!empty($jsonld['@type'])) { - $siteinfo = self::parseJsonLd($siteinfo, $jsonld); + $siteinfo = self::parseJsonLd($siteinfo, $jsonld, $root); } elseif (!empty($jsonld)) { $keys = array_keys($jsonld); $numeric_keys = true; @@ -769,7 +778,7 @@ class ParseUrl if ($numeric_keys) { foreach ($jsonld as $part) { if (!empty($part) && is_array($part)) { - $siteinfo = self::parseParts($siteinfo, $part); + $siteinfo = self::parseParts($siteinfo, $part, false); } } } @@ -794,7 +803,7 @@ class ParseUrl * * @return array siteinfo */ - private static function parseJsonLd(array $siteinfo, array $jsonld): array + private static function parseJsonLd(array $siteinfo, array $jsonld, bool $root): array { $type = JsonLD::fetchElement($jsonld, '@type'); if (empty($type)) { @@ -802,6 +811,10 @@ class ParseUrl return $siteinfo; } + if ($root) { + $siteinfo['schematypes'][] = $type; + } + // Silently ignore some types that aren't processed if (in_array($type, ['SiteNavigationElement', 'JobPosting', 'CreativeWork', 'MusicAlbum', 'WPHeader', 'WPSideBar', 'WPFooter', 'LegalService', 'MusicRecording', @@ -1276,7 +1289,7 @@ class ParseUrl $content = JsonLD::fetchElement($jsonld, 'uploadDate'); if (!empty($content) && is_string($content)) { - $media['uploaded'] = trim($content); + $media['uploaded'] = DateTimeFormat::utc($content); } $content = JsonLD::fetchElement($jsonld, 'image'); @@ -1321,6 +1334,22 @@ class ParseUrl DI::logger()->debug('Using Twitter oEmbed', ['url' => $url, 'oembed' => $oembed]); } + if (in_array(parse_url(Strings::normaliseLink($url), PHP_URL_HOST), ['tidal.com'])) { + $oembed = 'https://oembed.tidal.com?url=' . urlencode($url); + DI::logger()->debug('Using Tidal oEmbed', ['url' => $url, 'oembed' => $oembed]); + // @todo Check how to support the parameters listed here: https://developer.tidal.com/documentation/embeds/embeds-code-generator + } + + if (in_array(parse_url(Strings::normaliseLink($url), PHP_URL_HOST), ['link.deezer.com', 'deezer.com', 'www.deezer.com'])) { + $oembed = 'https://api.deezer.com/oembed?url=' . urlencode($url) . '&tracklist=true'; + DI::logger()->debug('Using Deezer oEmbed', ['url' => $url, 'oembed' => $oembed]); + // @see https://developers.deezer.com/api/oembed + } + + if (!$oembed) { + $oembed = self::fetchFromProviderList($url); + } + if (!$oembed) { foreach ($xpath->query("//link[@type='application/json+oembed']") as $link) { /** @var DOMElement $link */ @@ -1346,9 +1375,71 @@ class ParseUrl $data = current($urldata); DI::logger()->debug('Found oEmbed JSON from Embera', ['url' => $url]); } + + if (!isset($data['type']) || !isset($data['provider_url'])) { + return []; + } + + // Some provider return "rich", although they should return "photo" + if ($data['type'] === 'rich' && in_array($data['provider_url'], ['https://www.pixiv.net/', 'https://www.pinterest.com'])) { + $data['type'] = 'photo'; + } + return $data; } + /** + * Fetch the oEmbed provider from the oembed.com provider list + * + * @param string $url The url to fetch the oEmbed provider for + * + * @return string|null The oEmbed url or null if no provider was found + */ + private static function fetchFromProviderList(string $url): ?string + { + $cachekey = 'ParseUrl:fetchFromProviderList'; + + $providers = DI::cache()->get($cachekey); + if (!$providers) { + $providers_content = DI::httpClient()->fetch('https://oembed.com/providers.json', HttpClientAccept::JSON, 0, '', HttpClientRequest::SITEINFO); + if (!$providers_content) { + DI::logger()->warning('Could not fetch oEmbed provider list'); + return null; + } + $providers = json_decode($providers_content, true); + if (!is_array($providers)) { + DI::logger()->warning('Could not decode oEmbed provider list'); + return null; + } + DI::cache()->set($cachekey, $providers, Duration::WEEK); + } + $schemes = []; + foreach ($providers as $provider) { + if (!isset($provider['endpoints']) || !is_array($provider['endpoints'])) { + continue; + } + foreach ($provider['endpoints'] as $endpoint) { + if (!isset($endpoint['schemes']) || !is_array($endpoint['schemes'])) { + $schemes[rtrim($provider['provider_url'], '/') . '/*'] = str_replace('{format}', 'json', $endpoint['url']); + continue; + } + foreach ($endpoint['schemes'] as $scheme) { + $schemes[$scheme] = str_replace('{format}', 'json', $endpoint['url']); + } + } + } + + foreach ($schemes as $scheme => $provider_url) { + $regex = str_replace(['.', '?', '*'], ['\.', '\?', '.*'], $scheme); + if (preg_match('~' . $regex . '~i', $url)) { + $oembed = $provider_url . (strpos($provider_url, '?') === false ? '?' : '&') . 'url=' . urlencode($url); + DI::logger()->debug('Found oEmbed provider from oembed.com list', ['url' => $url, 'oembed' => $oembed]); + return $oembed; + } + } + return null; + } + private static function getSiteinfoFromoEmbed(array $siteinfo, array $data): array { // Youtube provides only basic information to some IP ranges. @@ -1358,31 +1449,34 @@ class ParseUrl $unknown_fields = $data; foreach (['account_type', 'asset_type', 'author_unique_id', 'availability', 'brand', - 'cache_age', 'category', 'currency_code', 'duration', 'embera_using_fake_response', - 'embera_provider_name', 'embed_product_id', 'embed_type', 'flickr_type', - 'height', 'html', 'images','iframe_url', 'is_plus', 'price', 'products', - 'product_expiration', 'product_id', 'quantity', 'referrer', 'safety', 'success', 'type', - 'thumbnail_credit', 'thumbnail_credit_url', 'thumbnail_credit_note', + 'cache_age', 'category', 'collection', 'currency_code', 'duration', 'embera_using_fake_response', + 'embera_provider_name', 'embed_product_id', 'embed_type', 'embed', 'entity', 'flickr_type', + 'height', 'html', 'id', 'images','iframe_url', 'is_plus', 'photographer', 'price', 'products', + 'product_expiration', 'product_id', 'quantity', 'ratio', 'referrer', 'safety', 'success', + 'terms_of_use_url', 'type', 'thumbnail_credit', 'thumbnail_credit_url', 'thumbnail_credit_note', 'thumbnail_height', 'thumbnail_url_with_play_button', 'thumbnail_width', - 'uri', 'url', 'version', 'video_id', 'web_page', 'web_page_short_url', 'width'] as $value) { + 'uri', 'url', 'version', 'video_id', 'web_page', 'web_page_short_url', 'width', 'work_type'] as $value) { unset($unknown_fields[$value]); } $fields = [ - 'title' => 'title', - 'description' => 'text', - 'summary' => 'text', - 'author_name' => 'author_name', - 'author_url' => 'author_url', - 'author' => 'author_name', - 'provider_name' => 'publisher_name', - 'provider_url' => 'publisher_url', - 'thumbnail_url' => 'image', - 'upload_date' => 'published', - 'publication_date' => 'published', - 'license' => 'license_name', - 'license_url' => 'license_url', - 'license_id' => 'license_id', + 'title' => 'title', + 'caption' => 'text', + 'description' => 'text', + 'summary' => 'text', + 'video_description' => 'text', + 'author_name' => 'author_name', + 'author_url' => 'author_url', + 'author' => 'author_name', + 'provider_name' => 'publisher_name', + 'provider_url' => 'publisher_url', + 'image' => 'image', + 'thumbnail_url' => 'image', + 'upload_date' => 'published', + 'publication_date' => 'published', + 'license' => 'license_name', + 'license_url' => 'license_url', + 'license_id' => 'license_id', ]; foreach ($fields as $key => $value) { @@ -1407,12 +1501,16 @@ class ParseUrl private static function getOembedInfo(DOMXPath $xpath, array $siteinfo): array { $data = self::getOembedData($xpath, $siteinfo['url']); - if (empty($data) || !is_array($data)) { + if (!$data) { return $siteinfo; } $siteinfo = self::getSiteinfoFromoEmbed($siteinfo, $data); + if (!self::isWantedEmbed($siteinfo, $data)) { + return $siteinfo; + } + if ($data['type'] == 'video' & empty($siteinfo['player']) && ($data['provider_url'] ?? '') == 'https://www.tiktok.com' && isset($data['embed_product_id']) && isset($data['thumbnail_width']) && isset($data['thumbnail_height'])) { $siteinfo['embed']['type'] = $data['type']; $siteinfo['embed']['html'] = trim($data['html']); @@ -1424,10 +1522,18 @@ class ParseUrl return $siteinfo; } + if ($data['provider_url'] == 'https://www.pinterest.com' && isset($siteinfo['video'])) { + $data['type'] = 'video'; + } + if (!isset($data['html'])) { return $siteinfo; } + if (strpos($data['html'], '<') === 0) { + $data['html'] = html_entity_decode($data['html']); + } + unset($siteinfo['player']); if ($data['type'] == 'rich' && !isset($siteinfo['text'])) { @@ -1455,7 +1561,7 @@ class ParseUrl $curlResult = DI::httpClient()->head($link); $redirect = $curlResult->getRedirectUrl(); if (preg_match('#/(video|broadcasts)/#', $redirect)) { - $siteinfo['embed']['type'] = $data['type']; + $siteinfo['embed']['type'] = 'video'; $siteinfo['embed']['html'] = trim(str_replace('query('/html/body/*'); - if ($nodes->length !== 1) { + if ($nodes->length !== 1 && $data['type'] != 'video') { return $siteinfo; } /** @var DOMElement $iframe */ $iframe = $nodes->item(0); - if ($iframe->nodeName !== 'iframe') { + $found = $iframe->nodeName == 'iframe'; + + // When the oEmbed data belongs to a video, we can safely use any iframe that we can fetch + if (!$found && $data['type'] == 'video') { + $nodes = $xpath->query('//iframe'); + if ($nodes->length > 0) { + /** @var DOMElement $iframe */ + $iframe = $nodes->item(0); + $found = true; + } + } + + if (!$found) { return $siteinfo; } diff --git a/src/Util/Writer/DocWriter.php b/src/Util/Writer/DocWriter.php index d4c6cc7f06..a92a5741de 100644 --- a/src/Util/Writer/DocWriter.php +++ b/src/Util/Writer/DocWriter.php @@ -16,6 +16,9 @@ use Friendica\Network\HTTPException\ServiceUnavailableException; */ class DocWriter { + /** @var string the relativ path to the database specification */ + const DOC_PATH_PREFIX = '/doc/en/spec/database/'; + /** * Creates all database definitions as Markdown fields and create the mkdoc config file. * @@ -83,14 +86,15 @@ class DocWriter 'extra' => 5, ]; foreach ($definition['fields'] as $key => $value) { - $field = []; - $field['name'] = $key; - $field['comment'] = $value['comment'] ?? ''; - $field['type'] = $value['type']; - $field['null'] = ($value['not null'] ?? false) ? 'NO' : 'YES'; - $field['primary'] = ($value['primary'] ?? false) ? 'PRI' : ''; - $field['default'] = $value['default'] ?? 'NULL'; - $field['extra'] = $value['extra'] ?? ''; + $field = [ + 'name' => $key, + 'comment' => $value['comment'] ?? '', + 'type' => $value['type'], + 'null' => ($value['not null'] ?? false) ? 'NO' : 'YES', + 'primary' => ($value['primary'] ?? false) ? 'PRI' : '', + 'default' => $value['default'] ?? 'NULL', + 'extra' => $value['extra'] ?? '', + ]; foreach ($field as $fieldName => $fieldvalue) { $lengths[$fieldName] = max($lengths[$fieldName] ?? 0, strlen($fieldvalue)); @@ -118,14 +122,14 @@ class DocWriter '$indexes' => $indexes, '$foreign' => $foreign, ]); - $filename = $basePath . '/doc/database/db_' . $name . '.md'; + $filename = $basePath . static::DOC_PATH_PREFIX . 'db-' . $name . '.md'; file_put_contents($filename, $content); } asort($tables); $content = Renderer::replaceMacros(Renderer::getMarkupTemplate('tables.tpl'), [ '$tables' => $tables, ]); - $filename = $basePath . '/doc/database.md'; + $filename = $basePath . static::DOC_PATH_PREFIX . 'index.md'; file_put_contents($filename, $content); } } diff --git a/src/Worker/Contact/BlockByUrl.php b/src/Worker/Contact/BlockByUrl.php new file mode 100644 index 0000000000..a103fa30ce --- /dev/null +++ b/src/Worker/Contact/BlockByUrl.php @@ -0,0 +1,55 @@ +notice('Contact not found for blocking', ['url' => $url]); + return; + } + + if (DI::baseUrl()->isLocalUrl($contact['nurl'])) { + DI::logger()->notice('Skipped blocking local contact', ['url' => $url]); + return; + } + + $existing = DBA::selectFirst('contact', ['blocked'], ['id' => $contact['id'], 'uid' => 0]); + if (!empty($existing) && $existing['blocked']) { + DI::logger()->debug('Contact already blocked', ['url' => $url]); + return; + } + + Contact::block($contact['id'], $reason); + DI::logger()->info('Contact blocked', ['url' => $url, 'id' => $contact['id']]); + + if ($purge) { + foreach (Contact::selectToArray(['id'], ['nurl' => $contact['nurl']]) as $contact_entry) { + Worker::add(Worker::PRIORITY_LOW, 'Contact\RemoveContent', $contact_entry['id']); + } + } + } +} diff --git a/src/Worker/FetchMissingReplies.php b/src/Worker/FetchMissingReplies.php new file mode 100644 index 0000000000..a3fe81260c --- /dev/null +++ b/src/Worker/FetchMissingReplies.php @@ -0,0 +1,28 @@ +info('Start fetching missing replies', ['url' => $uriId]); + Processor::fetchRepliesByUriId($uriId, $child); + DI::logger()->info('Fetched missing replies', ['url' => $uriId]); + } +} diff --git a/src/Worker/FetchOutbox.php b/src/Worker/FetchOutbox.php new file mode 100644 index 0000000000..1baf63db87 --- /dev/null +++ b/src/Worker/FetchOutbox.php @@ -0,0 +1,34 @@ +info('Start fetching posts for a given contact', ['cid' => $cid, 'uid' => $uid]); + $account = Contact::getAccountById($cid, ['ap-outbox']); + if (!isset($account['ap-outbox'])) { + DI::logger()->info('No outbox found for the given contact', ['cid' => $cid, 'uid' => $uid]); + return; + } + ActivityPub::fetchOutbox($account['ap-outbox'], $uid, DI::config()->get('system', 'max_feed_items')); + DI::logger()->info('Fetched posts for a given contact', ['cid' => $cid, 'uid' => $uid]); + } +} diff --git a/static/cid-v1.jsonld b/static/cid-v1.jsonld new file mode 100644 index 0000000000..6b536d0941 --- /dev/null +++ b/static/cid-v1.jsonld @@ -0,0 +1,112 @@ +{ + "@context": { + "id": "@id", + "type": "@type", + "alsoKnownAs": { + "@id": "https://www.w3.org/ns/activitystreams#alsoKnownAs", + "@type": "@id" + }, + "assertionMethod": { + "@id": "https://w3id.org/security#assertionMethod", + "@type": "@id", + "@container": "@set" + }, + "authentication": { + "@id": "https://w3id.org/security#authenticationMethod", + "@type": "@id", + "@container": "@set" + }, + "capabilityDelegation": { + "@id": "https://w3id.org/security#capabilityDelegationMethod", + "@type": "@id", + "@container": "@set" + }, + "capabilityInvocation": { + "@id": "https://w3id.org/security#capabilityInvocationMethod", + "@type": "@id", + "@container": "@set" + }, + "controller": { + "@id": "https://w3id.org/security#controller", + "@type": "@id" + }, + "keyAgreement": { + "@id": "https://w3id.org/security#keyAgreementMethod", + "@type": "@id", + "@container": "@set" + }, + "service": { + "@id": "https://www.w3.org/ns/did#service", + "@type": "@id", + "@context": { + "@protected": true, + "id": "@id", + "type": "@type", + "serviceEndpoint": { + "@id": "https://www.w3.org/ns/did#serviceEndpoint", + "@type": "@id" + } + } + }, + "verificationMethod": { + "@id": "https://w3id.org/security#verificationMethod", + "@type": "@id" + }, + "Multikey": { + "@id": "https://w3id.org/security#Multikey", + "@context": { + "@protected": true, + "id": "@id", + "type": "@type", + "controller": { + "@id": "https://w3id.org/security#controller", + "@type": "@id" + }, + "revoked": { + "@id": "https://w3id.org/security#revoked", + "@type": "http://www.w3.org/2001/XMLSchema#dateTime" + }, + "expires": { + "@id": "https://w3id.org/security#expiration", + "@type": "http://www.w3.org/2001/XMLSchema#dateTime" + }, + "publicKeyMultibase": { + "@id": "https://w3id.org/security#publicKeyMultibase", + "@type": "https://w3id.org/security#multibase" + }, + "secretKeyMultibase": { + "@id": "https://w3id.org/security#secretKeyMultibase", + "@type": "https://w3id.org/security#multibase" + } + } + }, + "JsonWebKey": { + "@id": "https://w3id.org/security#JsonWebKey", + "@context": { + "@protected": true, + "id": "@id", + "type": "@type", + "controller": { + "@id": "https://w3id.org/security#controller", + "@type": "@id" + }, + "revoked": { + "@id": "https://w3id.org/security#revoked", + "@type": "http://www.w3.org/2001/XMLSchema#dateTime" + }, + "expires": { + "@id": "https://w3id.org/security#expiration", + "@type": "http://www.w3.org/2001/XMLSchema#dateTime" + }, + "publicKeyJwk": { + "@id": "https://w3id.org/security#publicKeyJwk", + "@type": "@json" + }, + "secretKeyJwk": { + "@id": "https://w3id.org/security#secretKeyJwk", + "@type": "@json" + } + } + } + } +} diff --git a/static/data-integrity-v2.jsonld b/static/data-integrity-v2.jsonld new file mode 100644 index 0000000000..9e1a0971ad --- /dev/null +++ b/static/data-integrity-v2.jsonld @@ -0,0 +1,65 @@ +{ + "@context": { + "id": "@id", + "type": "@type", + "proof": { + "@id": "https://w3id.org/security#proof", + "@type": "@id" + }, + "DataIntegrityProof": { + "@id": "https://w3id.org/security#DataIntegrityProof" + }, + "challenge": "https://w3id.org/security#challenge", + "created": { + "@id": "http://purl.org/dc/terms/created", + "@type": "http://www.w3.org/2001/XMLSchema#dateTime" + }, + "domain": "https://w3id.org/security#domain", + "expires": { + "@id": "https://w3id.org/security#expiration", + "@type": "http://www.w3.org/2001/XMLSchema#dateTime" + }, + "nonce": "https://w3id.org/security#nonce", + "previousProof": { + "@id": "https://w3id.org/security#previousProof", + "@type": "@id" + }, + "proofPurpose": { + "@id": "https://w3id.org/security#proofPurpose", + "@type": "@vocab" + }, + "assertionMethod": { + "@id": "https://w3id.org/security#assertionMethod", + "@type": "@id" + }, + "authentication": { + "@id": "https://w3id.org/security#authenticationMethod", + "@type": "@id" + }, + "capabilityInvocation": { + "@id": "https://w3id.org/security#capabilityInvocationMethod", + "@type": "@id" + }, + "capabilityDelegation": { + "@id": "https://w3id.org/security#capabilityDelegationMethod", + "@type": "@id" + }, + "keyAgreement": { + "@id": "https://w3id.org/security#keyAgreementMethod", + "@type": "@id", + "@container": "@set" + }, + "cryptosuite": { + "@id": "https://w3id.org/security#cryptosuite", + "@type": "https://w3id.org/security#cryptosuiteString" + }, + "proofValue": { + "@id": "https://w3id.org/security#proofValue", + "@type": "https://w3id.org/security#multibase" + }, + "verificationMethod": { + "@id": "https://w3id.org/security#verificationMethod", + "@type": "@id" + } + } +} diff --git a/static/dbstructure.config.php b/static/dbstructure.config.php index baace5452d..a1528a338c 100644 --- a/static/dbstructure.config.php +++ b/static/dbstructure.config.php @@ -44,7 +44,7 @@ use Friendica\Database\DBA; // This file is required several times during the test in DbaDefinition which justifies this condition if (!defined('DB_UPDATE_VERSION')) { - define('DB_UPDATE_VERSION', 1582); + define('DB_UPDATE_VERSION', 1584); } return [ @@ -1284,7 +1284,7 @@ return [ "fields" => [ "uri-id" => ["type" => "int unsigned", "not null" => "1", "primary" => "1", "foreign" => ["item-uri" => "id"], "comment" => "Id of the item-uri table entry that contains the item uri"], "title" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "item title"], - "content-warning" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], + "content-warning" => ["type" => "varchar(500)", "not null" => "1", "default" => "", "comment" => ""], "body" => ["type" => "mediumtext", "comment" => "item body content"], "raw-body" => ["type" => "mediumtext", "comment" => "Body without embedded media links"], "quote-uri-id" => ["type" => "int unsigned", "foreign" => ["item-uri" => "id"], "comment" => "Id of the item-uri table that contains the quoted uri"], @@ -1373,12 +1373,14 @@ return [ "uri-id" => ["type" => "int unsigned", "not null" => "1", "primary" => "1", "foreign" => ["item-uri" => "id"], "comment" => "Id of the item-uri table entry that contains the item uri"], "edited" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "primary" => "1", "comment" => "Date of edit"], "title" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "item title"], - "content-warning" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], + "content-warning" => ["type" => "varchar(500)", "not null" => "1", "default" => "", "comment" => ""], "body" => ["type" => "mediumtext", "comment" => "item body content"], "raw-body" => ["type" => "mediumtext", "comment" => "Body without embedded media links"], + "quote-uri-id" => ["type" => "int unsigned", "foreign" => ["item-uri" => "id"], "comment" => "Id of the item-uri table that contains the quoted uri"], "location" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "text location where this item originated"], "coord" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "longitude/latitude pair representing location where this item originated"], "language" => ["type" => "text", "comment" => "Language information about this post"], + "sensitive" => ["type" => "boolean", "comment" => "If true, this post contains sensitive content"], "app" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "application which generated this item"], "rendered-hash" => ["type" => "varchar(32)", "not null" => "1", "default" => "", "comment" => ""], "rendered-html" => ["type" => "mediumtext", "comment" => "item.body converted to html"], @@ -1391,6 +1393,7 @@ return [ ], "indexes" => [ "PRIMARY" => ["uri-id", "edited"], + "quote-uri-id" => ["quote-uri-id"], ] ], "post-link" => [ @@ -1441,6 +1444,8 @@ return [ "embed-html" => ["type" => "text", "comment" => "HTML embed code for this media"], "embed-height" => ["type" => "smallint unsigned", "comment" => "Height of the embed"], "embed-width" => ["type" => "smallint unsigned", "comment" => "Width of the embed"], + "page-type" => ["type" => "varchar(30)", "comment" => "Type of the page (e.g. article, website)"], + "schematypes" => ["type" => "varchar(255)", "comment" => "Schema types of the page as JSON string"], "language" => ["type" => "char(3)", "comment" => "Language information about this media in the ISO 639 format"], "published" => ["type" => "datetime", "comment" => "Publification date of this media"], "modified" => ["type" => "datetime", "comment" => "Modification date of this media"], diff --git a/static/defaults.config.php b/static/defaults.config.php index 94a1a12176..feb6961499 100644 --- a/static/defaults.config.php +++ b/static/defaults.config.php @@ -370,6 +370,10 @@ return [ // The system timezone is used when no timezone is defined here. 'maintenance_end' => '03:00 +00:00', + // max_banner_width (Integer) + // Maximum width for profile banner images + 'max_banner_width' => 960, + // max_connections (Integer) // The maximum number of database connections which can be in use before the worker process is deferred to its next interval. // When the system can't detect the maximum numbers of connection then this value can be used. Use 0 for auto-detection. @@ -613,6 +617,10 @@ return [ // Minimum for this config value is 1. Maximum is 64 as the resulting profile URL mustn't be longer than 255 chars. 'username_max_length' => 48, + // videojs (Boolean) + // Experimental: Use Video.js as videoplayer. Since there are known issues, enabling is not recommended. + 'videojs' => false, + // worker_cooldown (Float) // Cooldown period in seconds before each worker function call. 'worker_cooldown' => 0, diff --git a/static/routes.config.php b/static/routes.config.php index 4c7b6949ec..c207b509fe 100644 --- a/static/routes.config.php +++ b/static/routes.config.php @@ -386,7 +386,7 @@ return [ '/contact' => [ '[/]' => [Module\Contact::class, [R::GET]], '/{id:\d+}[/]' => [Module\Contact\Profile::class, [R::GET, R::POST]], - '/{id:\d+}/{action:block|ignore|collapse|update|updateprofile}' + '/{id:\d+}/{action:block|ignore|collapse|update|updateprofile|fetchoutbox}' => [Module\Contact\Profile::class, [R::GET]], '/{id:\d+}/advanced' => [Module\Contact\Advanced::class, [R::GET, R::POST]], '/{id:\d+}/conversations' => [Module\Contact\Conversations::class, [R::GET]], @@ -467,6 +467,7 @@ return [ '/item/{id:\d+}' => [ '/activity/{verb}' => [Module\Item\Activity::class, [ R::POST]], '/follow' => [Module\Item\Follow::class, [ R::POST]], + '/complete' => [Module\Item\Complete::class, [ R::POST]], '/ignore' => [Module\Item\Ignore::class, [ R::POST]], '/language' => [Module\Item\Language::class, [R::GET]], '/pin' => [Module\Item\Pin::class, [ R::POST]], @@ -492,10 +493,12 @@ return [ '/moderation' => [ '[/]' => [Module\Moderation\Summary::class, [R::GET]], - '/blocklist/contact' => [Module\Moderation\Blocklist\Contact::class, [R::GET, R::POST]], - '/blocklist/server' => [Module\Moderation\Blocklist\Server\Index::class, [R::GET, R::POST]], - '/blocklist/server/add' => [Module\Moderation\Blocklist\Server\Add::class, [R::GET, R::POST]], - '/blocklist/server/import' => [Module\Moderation\Blocklist\Server\Import::class, [R::GET, R::POST]], + '/blocklist/contact' => [Module\Moderation\Blocklist\Contact::class, [R::GET, R::POST]], + '/blocklist/contact/export' => [Module\Moderation\Blocklist\Contact\Export::class, [R::GET]], + '/blocklist/contact/import' => [Module\Moderation\Blocklist\Contact\Import::class, [R::GET, R::POST]], + '/blocklist/server' => [Module\Moderation\Blocklist\Server\Index::class, [R::GET, R::POST]], + '/blocklist/server/add' => [Module\Moderation\Blocklist\Server\Add::class, [R::GET, R::POST]], + '/blocklist/server/import' => [Module\Moderation\Blocklist\Server\Import::class, [R::GET, R::POST]], '/item/delete' => [Module\Moderation\Item\Delete::class, [R::GET, R::POST]], '/item/source[/{guid}]' => [Module\Moderation\Item\Source::class, [R::GET, R::POST]], @@ -548,7 +551,11 @@ return [ '/token' => [Module\OAuth\Token::class, [R::POST]], ], - '/objects/{guid}[/{activity}]' => [Module\ActivityPub\Objects::class, [R::GET]], + '/objects/{guid}' => [ + '[/]' => [Module\ActivityPub\Objects::class, [R::GET]], + '/quote_authorization/{remote}' => [Module\ActivityPub\QuoteAuthorization::class, [R::GET]], + '/{activity}' => [Module\ActivityPub\Objects::class, [R::GET]], + ], '/outbox/{nickname}' => [Module\ActivityPub\Outbox::class, [R::GET, R::POST]], '/owa' => [Module\Owa::class, [R::GET]], diff --git a/static/settings.config.php b/static/settings.config.php index c3faf4b657..4d4c6cde91 100644 --- a/static/settings.config.php +++ b/static/settings.config.php @@ -113,6 +113,14 @@ return [ // URL of the global directory. 'directory' => 'https://dir.friendica.social', + // display_local_media (Boolean) + // Display local media to visitors. + 'display_local_media' => true, + + // display_remote_media (Boolean) + // Display non local media to visitors. + 'display_remote_media' => false, + // explicit_content (Boolean) // Set this to announce that your node is used mostly for explicit content that might not be suited for minors. 'explicit_content' => false, @@ -122,6 +130,15 @@ return [ // Default value comprises classic role names from RFC 2142. 'forbidden_nicknames' => 'info, marketing, sales, support, abuse, noc, security, postmaster, hostmaster, usenet, news, webmaster, www, uucp, ftp, root, sysop', + // fetch_replies (Constant) + // Defines which missing replies should be fetched from remote servers. + // Your choices are: + // FETCH_REPLIES_ALL = 0; // Fetch all missing replies (default) + // FETCH_REPLIES_NONE = 1; // Do not fetch any missing replies + // FETCH_REPLIES_FOLLOWED = 2; // Fetch only replies to posts from followed accounts + // FETCH_REPLIES_INTERACTION = 2; // Fetch only replies to posts with local interaction (likes, shares, replies + 'fetch_replies' => \Friendica\Protocol\ActivityPub\Processor::FETCH_REPLIES_ALL, + // compute_circle_counts (Boolean) // Compute contact circle level when counting unseen network posts. 'compute_circle_counts' => true, diff --git a/tests/src/Content/Text/BBCodeTest.php b/tests/src/Content/Text/BBCodeTest.php index 8c0e9c1a5d..3f568d8d54 100644 --- a/tests/src/Content/Text/BBCodeTest.php +++ b/tests/src/Content/Text/BBCodeTest.php @@ -726,12 +726,9 @@ Lucas: For the right price, yes.[/share]', public function dataConvertAttachment(): array { return [ - 'player' => [ - 'expected' => 'text
', - 'data' => [ + 'player-rich' => [ + 'expected' => 'text' . "\n" . -' ' . "\n" . -"\n" . -'' . "\n", + 'data' => [ 'author_name' => 'author_name', 'author_url' => 'http://domain.tld/author_url', 'description' => 'description', @@ -746,12 +743,12 @@ Lucas: For the right price, yes.[/share]', 'player_url' => 'http://domain.tld/player', 'player_width' => 620, 'player_height' => 480, + 'embed_type' => 'rich', ], ], - 'embed' => [ - 'expected' => 'text' . "\n" . -'', - 'data' => [ + 'embed-rich' => [ + 'expected' => 'text' . "\n", + 'data' => [ 'author_name' => 'author_name', 'author_url' => 'http://domain.tld/author_url', 'description' => 'description', @@ -764,6 +761,48 @@ Lucas: For the right price, yes.[/share]', 'type' => 'link', 'url' => 'http://domain.tld/page', 'player_url' => '', + 'embed_type' => 'rich', + 'embed_html' => '', + 'embed_width' => 620, + 'embed_height' => 480, + ] + ], + 'player-video' => [ + 'expected' => 'text' . "\n", + 'data' => [ + 'author_name' => 'author_name', + 'author_url' => 'http://domain.tld/author_url', + 'description' => 'description', + 'image' => 'http://domain.tld/image', + 'preview' => 'http://domain.tld/preview', + 'provider_name' => 'provider_name', + 'provider_url' => 'http://domain.tld/provider_url', + 'text' => 'text', + 'title' => 'title', + 'type' => 'link', + 'url' => 'http://domain.tld/page', + 'player_url' => 'http://domain.tld/player', + 'player_width' => 620, + 'player_height' => 480, + 'embed_type' => 'video', + ], + ], + 'embed-video' => [ + 'expected' => 'text' . "\n", + 'data' => [ + 'author_name' => 'author_name', + 'author_url' => 'http://domain.tld/author_url', + 'description' => 'description', + 'image' => 'http://domain.tld/image', + 'preview' => 'http://domain.tld/preview', + 'provider_name' => 'provider_name', + 'provider_url' => 'http://domain.tld/provider_url', + 'text' => 'text', + 'title' => 'title', + 'type' => 'link', + 'url' => 'http://domain.tld/page', + 'player_url' => '', + 'embed_type' => 'video', 'embed_html' => '', 'embed_width' => 620, 'embed_height' => 480, diff --git a/tests/src/Module/Api/Friendica/NotificationTest.php b/tests/src/Module/Api/Friendica/NotificationTest.php index c31b43d55d..990efd5600 100644 --- a/tests/src/Module/Api/Friendica/NotificationTest.php +++ b/tests/src/Module/Api/Friendica/NotificationTest.php @@ -43,7 +43,7 @@ class NotificationTest extends ApiTestCase public function testWithXmlResult() { $date = DateTimeFormat::local('2020-01-01 12:12:02'); - $dateRel = Temporal::getRelativeDate('2020-01-01 07:12:02'); + $dateRel = Temporal::getRelativeDate('2020-01-01 12:12:02'); $assertXml = <<diff --git a/tests/src/Util/DateTimeFormatTest.php b/tests/src/Util/DateTimeFormatTest.php index 6cc506807e..fb9d060ff4 100644 --- a/tests/src/Util/DateTimeFormatTest.php +++ b/tests/src/Util/DateTimeFormatTest.php @@ -204,6 +204,10 @@ class DateTimeFormatTest extends MockedTestCase 'expected' => '2022-06-02 07:58:35', 's' => 'Thu, 02 Jun 2022 16:58:35 Asia/Tokyo', ], + 'microsecond timestamp' => [ + 'expected' => '2025-11-05 22:11:28', + 's' => '1762380688000' + ], ]; } diff --git a/translations.txt.license b/translations.txt.license deleted file mode 100644 index 8a315c7ab7..0000000000 --- a/translations.txt.license +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-FileCopyrightText: 2010 - 2024 the Friendica project - -SPDX-License-Identifier: CC0-1.0 diff --git a/view/global.css b/view/global.css index 83ea930f25..12d8072084 100644 --- a/view/global.css +++ b/view/global.css @@ -352,7 +352,7 @@ img.acpopup-img { .fbrowser.photo a img, .fbrowser.photo .btn-link img { height: 48px; } .fbrowser.photo a p, .fbrowser.photo .btn-link p { display: none;} .fbrowser.attachment .photo-album-image-wrapper { float:none; white-space: nowrap; } -.fbrowser.attachment img { display: inline; } +.fbrowser.attachment img { display: inline; height: 16px; width: 16px; } .fbrowser.attachment p { display: inline; white-space: nowrap; } .fbrowser .upload { clear: both; padding-top: 1em;} .fbrowser .error { background: #ffeeee; border: 1px solid #994444; color: #994444; padding: 0.5em;} @@ -789,10 +789,22 @@ summary.wall-item-summary { } /* css instructions notification.tpl */ +.notifications-content-wrapper h2 { + font-size: 24.5px; + margin-top: 10px; +} + +#notifications-show-hide-link { + display: inline-block; + padding-bottom: 10px; +} + /* Flexbox layout to align the icon and text in a single line */ .notif-item a { - display: flex; align-items: flex-start; + color: black; + display: flex; + font-size: 14px; } /* Margin to create space between the icon and the text */ @@ -803,10 +815,15 @@ summary.wall-item-summary { /* Styles to ensure the text wraps properly after 70 characters */ .notif-text { display: inline-block; - max-width: 70ch; + max-width: 80ch; overflow-wrap: break-word; } +.notif-when { + color: #777777; + margin-bottom: 0; +} + /* Add alt tag indicators to the relevant images */ a:has(img.has-alt-description)::after { background: rgba(0, 0, 0, 0.69); @@ -842,3 +859,33 @@ a:has(img.has-alt-description)::after { #change-profile-picture:hover { opacity: 1; } + +/* Post published alert - toast notification style */ +#post-published-alert { + position: fixed; + bottom: 20px; + right: 20px; + z-index: 1050; + min-width: 250px; + max-width: 350px; + box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15); + border-radius: 4px; +} + +#post-published-alert .alert-link { + text-decoration: underline; +} + +/* Highlight animation for new posts */ +.highlight-post { + animation: highlight-fade 2s ease-out; +} + +@keyframes highlight-fade { + 0% { + background-color: rgba(49, 112, 143, 0.2); + } + 100% { + background-color: transparent; + } +} diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js index f332e0bdc0..59995e2acc 100644 --- a/view/js/autocomplete.js +++ b/view/js/autocomplete.js @@ -352,7 +352,7 @@ function string2bb(element) { $.fn.bbco_autocomplete = function(type) { if (type === 'bbcode') { - var open_close_elements = ['bold', 'italic', 'underline', 'overline', 'strike', 'quote', 'code', 'spoiler', 'map', 'img', 'url', 'audio', 'video', 'embed', 'list', 'ul', 'ol', 'li', 'table', 'tr', 'th', 'td', 'center', 'color', 'font', 'size', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'nobb', 'noparse', 'pre', 'abstract', 'share', 'attachment']; + var open_close_elements = ['bold', 'italic', 'underline', 'overline', 'strike', 'quote', 'code', 'spoiler', 'map', 'img', 'url', 'audio', 'video', 'embed', 'list', 'ul', 'ol', 'li', 'table', 'tr', 'th', 'td', 'center', 'color', 'font', 'size', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'nobb', 'noparse', 'pre', 'abstract', 'share', 'attachment', 'mark']; var open_elements = ['*', 'hr']; var elements = open_close_elements.concat(open_elements); diff --git a/view/js/country.js b/view/js/country.js index 06b77ae37f..230ff03120 100644 --- a/view/js/country.js +++ b/view/js/country.js @@ -13,275 +13,267 @@ // // Thursday, January 13, 2005, 7:00:52 PM // -var gLngMaxStateLength=0; -var gLngMaxCountryLength=0; -var gLngNumberCountries=253; -var gLngNumberStates=0; -var gLngSelectedCountry=0; -var gLngSelectedState=0; +var gLngMaxStateLength = 0; +var gLngMaxCountryLength = 0; +var gLngNumberCountries = 0; +var gLngNumberStates = 0; +var gLngSelectedCountry = 0; +var gLngSelectedState = 0; var gArCountryInfo; var gArStateInfo; -// NOTE: -// Some editors may exhibit problems viewing 2803 characters... -var sCountryString = "|Afghanistan|Albania|Algeria|American Samoa|Angola|Anguilla|Antartica|Antigua and Barbuda|Argentina|Armenia|Aruba|Ashmore and Cartier Island|Australia|Austria|Azerbaijan|Bahamas|Bahrain|Bangladesh|Barbados|Belarus|Belgium|Belize|Benin|Bermuda|Bhutan|Bolivia|Bosnia and Herzegovina|Botswana|Brazil|British Virgin Islands|Brunei|Bulgaria|Burkina Faso|Burma|Burundi|Cambodia|Cameroon|Canada|Cape Verde|Cayman Islands|Central African Republic|Chad|Chile|China|Christmas Island|Clipperton Island|Cocos (Keeling) Islands|Colombia|Comoros|Congo, Democratic Republic of the|Congo, Republic of the|Cook Islands|Costa Rica|Cote d'Ivoire|Croatia|Cuba|Cyprus|Czech Republic|Denmark|Djibouti|Dominica|Dominican Republic|Ecuador|Egypt|El Salvador|Equatorial Guinea|Eritrea|Estonia|Ethiopia|Europa Island|Falkland Islands (Islas Malvinas)|Faroe Islands|Fiji|Finland|France|French Guiana|French Polynesia|French Southern and Antarctic Lands|Gabon|Gambia, The|Gaza Strip|Georgia|Germany|Ghana|Gibraltar|Glorioso Islands|Greece|Greenland|Grenada|Guadeloupe|Guam|Guatemala|Guernsey|Guinea|Guinea-Bissau|Guyana|Haiti|Heard Island and McDonald Islands|Holy See (Vatican City)|Honduras|Hong Kong|Howland Island|Hungary|Iceland|India|Indonesia|Iran|Iraq|Ireland|Ireland, Northern|Israel|Italy|Jamaica|Jan Mayen|Japan|Jarvis Island|Jersey|Johnston Atoll|Jordan|Juan de Nova Island|Kazakhstan|Kenya|Kiribati|Korea, North|Korea, South|Kuwait|Kyrgyzstan|Laos|Latvia|Lebanon|Lesotho|Liberia|Libya|Liechtenstein|Lithuania|Luxembourg|Macau|Macedonia, Former Yugoslav Republic of|Madagascar|Malawi|Malaysia|Maldives|Mali|Malta|Man, Isle of|Marshall Islands|Martinique|Mauritania|Mauritius|Mayotte|Mexico|Micronesia, Federated States of|Midway Islands|Moldova|Monaco|Mongolia|Montserrat|Morocco|Mozambique|Namibia|Nauru|Nepal|Netherlands|Netherlands Antilles|New Caledonia|New Zealand|Nicaragua|Niger|Nigeria|Niue|Norfolk Island|Northern Mariana Islands|Norway|Oman|Pakistan|Palau|Panama|Papua New Guinea|Paraguay|Peru|Philippines|Pitcaim Islands|Poland|Portugal|Puerto Rico|Qatar|Reunion|Romania|Russia|Rwanda|Saint Helena|Saint Kitts and Nevis|Saint Lucia|Saint Pierre and Miquelon|Saint Vincent and the Grenadines|Samoa|San Marino|Sao Tome and Principe|Saudi Arabia|Scotland|Senegal|Seychelles|Sierra Leone|Singapore|Slovakia|Slovenia|Solomon Islands|Somalia|South Africa|South Georgia and South Sandwich Islands|Spain|Spratly Islands|Sri Lanka|Sudan|Suriname|Svalbard|Swaziland|Sweden|Switzerland|Syria|Taiwan|Tajikistan|Tanzania|Thailand|Tobago|Toga|Tokelau|Tonga|Trinidad|Tunisia|Turkey|Turkmenistan|Tuvalu|Uganda|Ukraine|United Arab Emirates|United Kingdom|Uruguay|USA|Uzbekistan|Vanuatu|Venezuela|Vietnam|Virgin Islands|Wales|Wallis and Futuna|West Bank|Western Sahara|Yemen|Yugoslavia|Zambia|Zimbabwe|Friendicaland" +var gCountryList = []; var aStates = new Array(); -aStates[0]=""; -aStates[1]="|Badakhshan|Badghis|Baghlan|Balkh|Bamian|Farah|Faryab|Ghazni|Ghowr|Helmand|Herat|Jowzjan|Kabol|Kandahar|Kapisa|Konar|Kondoz|Laghman|Lowgar|Nangarhar|Nimruz|Oruzgan|Paktia|Paktika|Parvan|Samangan|Sar-e Pol|Takhar|Vardak|Zabol"; -aStates[2]="|Berat|Bulqize|Delvine|Devoll (Bilisht)|Diber (Peshkopi)|Durres|Elbasan|Fier|Gjirokaster|Gramsh|Has (Krume)|Kavaje|Kolonje (Erseke)|Korce|Kruje|Kucove|Kukes|Kurbin|Lezhe|Librazhd|Lushnje|Malesi e Madhe (Koplik)|Mallakaster (Ballsh)|Mat (Burrel)|Mirdite (Rreshen)|Peqin|Permet|Pogradec|Puke|Sarande|Shkoder|Skrapar (Corovode)|Tepelene|Tirane (Tirana)|Tirane (Tirana)|Tropoje (Bajram Curri)|Vlore"; -aStates[3]="|Adrar|Ain Defla|Ain Temouchent|Alger|Annaba|Batna|Bechar|Bejaia|Biskra|Blida|Bordj Bou Arreridj|Bouira|Boumerdes|Chlef|Constantine|Djelfa|El Bayadh|El Oued|El Tarf|Ghardaia|Guelma|Illizi|Jijel|Khenchela|Laghouat|M'Sila|Mascara|Medea|Mila|Mostaganem|Naama|Oran|Ouargla|Oum el Bouaghi|Relizane|Saida|Setif|Sidi Bel Abbes|Skikda|Souk Ahras|Tamanghasset|Tebessa|Tiaret|Tindouf|Tipaza|Tissemsilt|Tizi Ouzou|Tlemcen"; -aStates[4]="|Eastern|Manu'a|Rose Island|Swains Island|Western"; -aStates[5]="|Andorra la Vella|Bengo|Benguela|Bie|Cabinda|Canillo|Cuando Cubango|Cuanza Norte|Cuanza Sul|Cunene|Encamp|Escaldes-Engordany|Huambo|Huila|La Massana|Luanda|Lunda Norte|Lunda Sul|Malanje|Moxico|Namibe|Ordino|Sant Julia de Loria|Uige|Zaire"; -aStates[6]="|Anguilla"; -aStates[7]="|Antartica"; -aStates[8]="|Barbuda|Redonda|Saint George|Saint John|Saint Mary|Saint Paul|Saint Peter|Saint Philip"; -aStates[9]="|Antartica e Islas del Atlantico Sur|Buenos Aires|Buenos Aires Capital Federal|Catamarca|Chaco|Chubut|Cordoba|Corrientes|Entre Rios|Formosa|Jujuy|La Pampa|La Rioja|Mendoza|Misiones|Neuquen|Rio Negro|Salta|San Juan|San Luis|Santa Cruz|Santa Fe|Santiago del Estero|Tierra del Fuego|Tucuman"; -aStates[10]="|Aragatsotn|Ararat|Armavir|Geghark'unik'|Kotayk'|Lorri|Shirak|Syunik'|Tavush|Vayots' Dzor|Yerevan"; -aStates[11]="|Aruba"; -aStates[12]="|Ashmore and Cartier Island"; -aStates[13]="|Australian Capital Territory|New South Wales|Northern Territory|Queensland|South Australia|Tasmania|Victoria|Western Australia"; -aStates[14]="|Burgenland|Kaernten|Niederoesterreich|Oberoesterreich|Salzburg|Steiermark|Tirol|Vorarlberg|Wien"; -aStates[15]="|Abseron Rayonu|Agcabadi Rayonu|Agdam Rayonu|Agdas Rayonu|Agstafa Rayonu|Agsu Rayonu|Ali Bayramli Sahari|Astara Rayonu|Baki Sahari|Balakan Rayonu|Barda Rayonu|Beylaqan Rayonu|Bilasuvar Rayonu|Cabrayil Rayonu|Calilabad Rayonu|Daskasan Rayonu|Davaci Rayonu|Fuzuli Rayonu|Gadabay Rayonu|Ganca Sahari|Goranboy Rayonu|Goycay Rayonu|Haciqabul Rayonu|Imisli Rayonu|Ismayilli Rayonu|Kalbacar Rayonu|Kurdamir Rayonu|Lacin Rayonu|Lankaran Rayonu|Lankaran Sahari|Lerik Rayonu|Masalli Rayonu|Mingacevir Sahari|Naftalan Sahari|Naxcivan Muxtar Respublikasi|Neftcala Rayonu|Oguz Rayonu|Qabala Rayonu|Qax Rayonu|Qazax Rayonu|Qobustan Rayonu|Quba Rayonu|Qubadli Rayonu|Qusar Rayonu|Saatli Rayonu|Sabirabad Rayonu|Saki Rayonu|Saki Sahari|Salyan Rayonu|Samaxi Rayonu|Samkir Rayonu|Samux Rayonu|Siyazan Rayonu|Sumqayit Sahari|Susa Rayonu|Susa Sahari|Tartar Rayonu|Tovuz Rayonu|Ucar Rayonu|Xacmaz Rayonu|Xankandi Sahari|Xanlar Rayonu|Xizi Rayonu|Xocali Rayonu|Xocavand Rayonu|Yardimli Rayonu|Yevlax Rayonu|Yevlax Sahari|Zangilan Rayonu|Zaqatala Rayonu|Zardab Rayonu"; -aStates[16]="|Acklins and Crooked Islands|Bimini|Cat Island|Exuma|Freeport|Fresh Creek|Governor's Harbour|Green Turtle Cay|Harbour Island|High Rock|Inagua|Kemps Bay|Long Island|Marsh Harbour|Mayaguana|New Providence|Nicholls Town and Berry Islands|Ragged Island|Rock Sound|San Salvador and Rum Cay|Sandy Point"; -aStates[17]="|Al Hadd|Al Manamah|Al Mintaqah al Gharbiyah|Al Mintaqah al Wusta|Al Mintaqah ash Shamaliyah|Al Muharraq|Ar Rifa' wa al Mintaqah al Janubiyah|Jidd Hafs|Juzur Hawar|Madinat 'Isa|Madinat Hamad|Sitrah"; -aStates[18]="|Barisal|Chittagong|Dhaka|Khulna|Rajshahi|Sylhet"; -aStates[19]="|Bridgetown|Christ Church|Saint Andrew|Saint George|Saint James|Saint John|Saint Joseph|Saint Lucy|Saint Michael|Saint Peter|Saint Philip|Saint Thomas"; -aStates[20]="|Brestskaya (Brest)|Homyel'skaya (Homyel')|Horad Minsk|Hrodzyenskaya (Hrodna)|Mahilyowskaya (Mahilyow)|Minskaya|Vitsyebskaya (Vitsyebsk)"; -aStates[21]="|Antwerpen|Brabant Wallon|Brussels Capitol Region|Hainaut|Liege|Limburg|Luxembourg|Namur|Oost-Vlaanderen|Vlaams Brabant|West-Vlaanderen"; -aStates[22]="|Belize|Cayo|Corozal|Orange Walk|Stann Creek|Toledo"; -aStates[23]="|Alibori|Atakora|Atlantique|Borgou|Collines|Couffo|Donga|Littoral|Mono|Oueme|Plateau|Zou"; -aStates[24]="|Devonshire|Hamilton (City)|Hamilton|Paget|Pembroke|Saint George|Saint Georges|Sandys|Smiths|Southampton|Warwick"; -aStates[25]="|Bumthang|Chhukha|Chirang|Daga|Geylegphug|Ha|Lhuntshi|Mongar|Paro|Pemagatsel|Punakha|Samchi|Samdrup Jongkhar|Shemgang|Tashigang|Thimphu|Tongsa|Wangdi Phodrang"; -aStates[26]="|Beni|Chuquisaca|Cochabamba|La Paz|Oruro|Pando|Potosi|Santa Cruz|Tarija"; -aStates[27]="|Federation of Bosnia and Herzegovina|Republika Srpska"; -aStates[28]="|Central|Chobe|Francistown|Gaborone|Ghanzi|Kgalagadi|Kgatleng|Kweneng|Lobatse|Ngamiland|North-East|Selebi-Pikwe|South-East|Southern"; -aStates[29]="|Acre|Alagoas|Amapa|Amazonas|Bahia|Ceara|Distrito Federal|Espirito Santo|Goias|Maranhao|Mato Grosso|Mato Grosso do Sul|Minas Gerais|Para|Paraiba|Parana|Pernambuco|Piaui|Rio de Janeiro|Rio Grande do Norte|Rio Grande do Sul|Rondonia|Roraima|Santa Catarina|Sao Paulo|Sergipe|Tocantins"; -aStates[30]="|Anegada|Jost Van Dyke|Tortola|Virgin Gorda"; -aStates[31]="|Belait|Brunei and Muara|Temburong|Tutong"; -aStates[32]="|Blagoevgrad|Burgas|Dobrich|Gabrovo|Haskovo|Kardzhali|Kyustendil|Lovech|Montana|Pazardzhik|Pernik|Pleven|Plovdiv|Razgrad|Rousse|Shumen|Silistra|Sliven|Smolyan|Sofia|Stara Zagora|Turgovishte|Varna|Veliko Turnovo|Vidin|Vratsa|Yambol"; -aStates[33]="|Bale|Bam|Banwa|Bazega|Bougouriba|Boulgou|Boulkiemde|Comoe|Ganzourgou|Gnagna|Gourma|Houet|Ioba|Kadiogo|Kenedougou|Komandjari|Kompienga|Kossi|Koupelogo|Kouritenga|Kourweogo|Leraba|Loroum|Mouhoun|Nahouri|Namentenga|Naumbiel|Nayala|Oubritenga|Oudalan|Passore|Poni|Samentenga|Sanguie|Seno|Sissili|Soum|Sourou|Tapoa|Tuy|Yagha|Yatenga|Ziro|Zondomo|Zoundweogo"; -aStates[34]="|Ayeyarwady|Bago|Chin State|Kachin State|Kayah State|Kayin State|Magway|Mandalay|Mon State|Rakhine State|Sagaing|Shan State|Tanintharyi|Yangon"; -aStates[35]="|Bubanza|Bujumbura|Bururi|Cankuzo|Cibitoke|Gitega|Karuzi|Kayanza|Kirundo|Makamba|Muramvya|Muyinga|Mwaro|Ngozi|Rutana|Ruyigi"; -aStates[36]="|Banteay Mean Cheay|Batdambang|Kampong Cham|Kampong Chhnang|Kampong Spoe|Kampong Thum|Kampot|Kandal|Kaoh Kong|Keb|Kracheh|Mondol Kiri|Otdar Mean Cheay|Pailin|Phnum Penh|Pouthisat|Preah Seihanu (Sihanoukville)|Preah Vihear|Prey Veng|Rotanah Kiri|Siem Reab|Stoeng Treng|Svay Rieng|Takev"; -aStates[37]="|Adamaoua|Centre|Est|Extreme-Nord|Littoral|Nord|Nord-Ouest|Ouest|Sud|Sud-Ouest"; -aStates[38]="|Alberta|British Columbia|Manitoba|New Brunswick|Newfoundland|Northwest Territories|Nova Scotia|Nunavut|Ontario|Prince Edward Island|Quebec|Saskatchewan|Yukon Territory"; -aStates[39]="|Boa Vista|Brava|Maio|Mosteiros|Paul|Porto Novo|Praia|Ribeira Grande|Sal|Santa Catarina|Santa Cruz|Sao Domingos|Sao Filipe|Sao Nicolau|Sao Vicente|Tarrafal"; -aStates[40]="|Creek|Eastern|Midland|South Town|Spot Bay|Stake Bay|West End|Western"; -aStates[41]="|Bamingui-Bangoran|Bangui|Basse-Kotto|Gribingui|Haut-Mbomou|Haute-Kotto|Haute-Sangha|Kemo-Gribingui|Lobaye|Mbomou|Nana-Mambere|Ombella-Mpoko|Ouaka|Ouham|Ouham-Pende|Sangha|Vakaga"; -aStates[42]="|Batha|Biltine|Borkou-Ennedi-Tibesti|Chari-Baguirmi|Guera|Kanem|Lac|Logone Occidental|Logone Oriental|Mayo-Kebbi|Moyen-Chari|Ouaddai|Salamat|Tandjile"; -aStates[43]="|Aisen del General Carlos Ibanez del Campo|Antofagasta|Araucania|Atacama|Bio-Bio|Coquimbo|Libertador General Bernardo O'Higgins|Los Lagos|Magallanes y de la Antartica Chilena|Maule|Region Metropolitana (Santiago)|Tarapaca|Valparaiso"; -aStates[44]="|Anhui|Beijing|Chongqing|Fujian|Gansu|Guangdong|Guangxi|Guizhou|Hainan|Hebei|Heilongjiang|Henan|Hubei|Hunan|Jiangsu|Jiangxi|Jilin|Liaoning|Nei Mongol|Ningxia|Qinghai|Shaanxi|Shandong|Shanghai|Shanxi|Sichuan|Tianjin|Xinjiang|Xizang (Tibet)|Yunnan|Zhejiang"; -aStates[45]="|Christmas Island"; -aStates[46]="|Clipperton Island"; -aStates[47]="|Direction Island|Home Island|Horsburgh Island|North Keeling Island|South Island|West Island"; -aStates[48]="|Amazonas|Antioquia|Arauca|Atlantico|Bolivar|Boyaca|Caldas|Caqueta|Casanare|Cauca|Cesar|Choco|Cordoba|Cundinamarca|Distrito Capital de Santa Fe de Bogota|Guainia|Guaviare|Huila|La Guajira|Magdalena|Meta|Narino|Norte de Santander|Putumayo|Quindio|Risaralda|San Andres y Providencia|Santander|Sucre|Tolima|Valle del Cauca|Vaupes|Vichada"; -// -aStates[49]="|Anjouan (Nzwani)|Domoni|Fomboni|Grande Comore (Njazidja)|Moheli (Mwali)|Moroni|Moutsamoudou"; -aStates[50]="|Bandundu|Bas-Congo|Equateur|Kasai-Occidental|Kasai-Oriental|Katanga|Kinshasa|Maniema|Nord-Kivu|Orientale|Sud-Kivu"; -aStates[51]="|Bouenza|Brazzaville|Cuvette|Kouilou|Lekoumou|Likouala|Niari|Plateaux|Pool|Sangha"; -aStates[52]="|Aitutaki|Atiu|Avarua|Mangaia|Manihiki|Manuae|Mauke|Mitiaro|Nassau Island|Palmerston|Penrhyn|Pukapuka|Rakahanga|Rarotonga|Suwarrow|Takutea"; -aStates[53]="|Alajuela|Cartago|Guanacaste|Heredia|Limon|Puntarenas|San Jose"; -aStates[54]="|Abengourou|Abidjan|Aboisso|Adiake'|Adzope|Agboville|Agnibilekrou|Ale'pe'|Bangolo|Beoumi|Biankouma|Bocanda|Bondoukou|Bongouanou|Bouafle|Bouake|Bouna|Boundiali|Dabakala|Dabon|Daloa|Danane|Daoukro|Dimbokro|Divo|Duekoue|Ferkessedougou|Gagnoa|Grand Bassam|Grand-Lahou|Guiglo|Issia|Jacqueville|Katiola|Korhogo|Lakota|Man|Mankono|Mbahiakro|Odienne|Oume|Sakassou|San-Pedro|Sassandra|Seguela|Sinfra|Soubre|Tabou|Tanda|Tiassale|Tiebissou|Tingrela|Touba|Toulepleu|Toumodi|Vavoua|Yamoussoukro|Zuenoula"; -aStates[55]="|Bjelovarsko-Bilogorska Zupanija|Brodsko-Posavska Zupanija|Dubrovacko-Neretvanska Zupanija|Istarska Zupanija|Karlovacka Zupanija|Koprivnicko-Krizevacka Zupanija|Krapinsko-Zagorska Zupanija|Licko-Senjska Zupanija|Medimurska Zupanija|Osjecko-Baranjska Zupanija|Pozesko-Slavonska Zupanija|Primorsko-Goranska Zupanija|Sibensko-Kninska Zupanija|Sisacko-Moslavacka Zupanija|Splitsko-Dalmatinska Zupanija|Varazdinska Zupanija|Viroviticko-Podravska Zupanija|Vukovarsko-Srijemska Zupanija|Zadarska Zupanija|Zagreb|Zagrebacka Zupanija"; -aStates[56]="|Camaguey|Ciego de Avila|Cienfuegos|Ciudad de La Habana|Granma|Guantanamo|Holguin|Isla de la Juventud|La Habana|Las Tunas|Matanzas|Pinar del Rio|Sancti Spiritus|Santiago de Cuba|Villa Clara"; -aStates[57]="|Famagusta|Kyrenia|Larnaca|Limassol|Nicosia|Paphos"; -aStates[58]="|Brnensky|Budejovicky|Jihlavsky|Karlovarsky|Kralovehradecky|Liberecky|Olomoucky|Ostravsky|Pardubicky|Plzensky|Praha|Stredocesky|Ustecky|Zlinsky"; -aStates[59]="|Aalborg|Aarhus|Bornholm|Esbjerg|Falster|Frederiksberg|Fyn|Hillerød|Horsens|Kolding|København|Als|Langeland|Lolland|Midtjylland|Nordjylland|Nordsjælland|Odense|Randers|Roskilde|Syddanmark|Morsø|Møn|Sydsjælland|Vejle|Vestsjælland|Viborg"; -aStates[60]="|'Ali Sabih|Dikhil|Djibouti|Obock|Tadjoura"; -aStates[61]="|Saint Andrew|Saint David|Saint George|Saint John|Saint Joseph|Saint Luke|Saint Mark|Saint Patrick|Saint Paul|Saint Peter"; -aStates[62]="|Azua|Baoruco|Barahona|Dajabon|Distrito Nacional|Duarte|El Seibo|Elias Pina|Espaillat|Hato Mayor|Independencia|La Altagracia|La Romana|La Vega|Maria Trinidad Sanchez|Monsenor Nouel|Monte Cristi|Monte Plata|Pedernales|Peravia|Puerto Plata|Salcedo|Samana|San Cristobal|San Juan|San Pedro de Macoris|Sanchez Ramirez|Santiago|Santiago Rodriguez|Valverde"; -// -aStates[63]="|Azuay|Bolivar|Canar|Carchi|Chimborazo|Cotopaxi|El Oro|Esmeraldas|Galapagos|Guayas|Imbabura|Loja|Los Rios|Manabi|Morona-Santiago|Napo|Orellana|Pastaza|Pichincha|Sucumbios|Tungurahua|Zamora-Chinchipe"; -aStates[64]="|Ad Daqahliyah|Al Bahr al Ahmar|Al Buhayrah|Al Fayyum|Al Gharbiyah|Al Iskandariyah|Al Isma'iliyah|Al Jizah|Al Minufiyah|Al Minya|Al Qahirah|Al Qalyubiyah|Al Wadi al Jadid|As Suways|Ash Sharqiyah|Aswan|Asyut|Bani Suwayf|Bur Sa'id|Dumyat|Janub Sina'|Kafr ash Shaykh|Matruh|Qina|Shamal Sina'|Suhaj"; -aStates[65]="|Ahuachapan|Cabanas|Chalatenango|Cuscatlan|La Libertad|La Paz|La Union|Morazan|San Miguel|San Salvador|San Vicente|Santa Ana|Sonsonate|Usulutan"; -aStates[66]="|Annobon|Bioko Norte|Bioko Sur|Centro Sur|Kie-Ntem|Litoral|Wele-Nzas"; -aStates[67]="|Akale Guzay|Barka|Denkel|Hamasen|Sahil|Semhar|Senhit|Seraye"; -aStates[68]="|Harjumaa (Tallinn)|Hiiumaa (Kardla)|Ida-Virumaa (Johvi)|Jarvamaa (Paide)|Jogevamaa (Jogeva)|Laane-Virumaa (Rakvere)|Laanemaa (Haapsalu)|Parnumaa (Parnu)|Polvamaa (Polva)|Raplamaa (Rapla)|Saaremaa (Kuessaare)|Tartumaa (Tartu)|Valgamaa (Valga)|Viljandimaa (Viljandi)|Vorumaa (Voru)" -aStates[69]="|Adis Abeba (Addis Ababa)|Afar|Amara|Dire Dawa|Gambela Hizboch|Hareri Hizb|Oromiya|Sumale|Tigray|YeDebub Biheroch Bihereseboch na Hizboch"; -aStates[70]="|Europa Island"; -aStates[71]="|Falkland Islands (Islas Malvinas)" -aStates[72]="|Bordoy|Eysturoy|Mykines|Sandoy|Skuvoy|Streymoy|Suduroy|Tvoroyri|Vagar"; -aStates[73]="|Central|Eastern|Northern|Rotuma|Western"; -aStates[74]="|Aland|Etela-Suomen Laani|Ita-Suomen Laani|Lansi-Suomen Laani|Lappi|Oulun Laani"; -aStates[75]="|Alsace|Aquitaine|Auvergne|Basse-Normandie|Bourgogne|Bretagne|Centre|Champagne-Ardenne|Corse|Franche-Comté|Haute-Normandie|Île-de-France|Languedoc-Roussillon|Limousin|Lorraine|Midi-Pyrénées|Nord-Pas-de-Calais|Pays de la Loire|Picardie|Poitou-Charentes|Provence-Alpes-Côte d’Azur|Rhône-Alpes"; -aStates[76]="|French Guiana"; -aStates[77]="|Archipel des Marquises|Archipel des Tuamotu|Archipel des Tubuai|Iles du Vent|Iles Sous-le-Vent"; -aStates[78]="|Adelie Land|Ile Crozet|Iles Kerguelen|Iles Saint-Paul et Amsterdam"; -aStates[79]="|Estuaire|Haut-Ogooue|Moyen-Ogooue|Ngounie|Nyanga|Ogooue-Ivindo|Ogooue-Lolo|Ogooue-Maritime|Woleu-Ntem"; -aStates[80]="|Banjul|Central River|Lower River|North Bank|Upper River|Western"; -aStates[81]="|Gaza Strip"; -aStates[82]="|Abashis|Abkhazia or Ap'khazet'is Avtonomiuri Respublika (Sokhumi)|Adigenis|Ajaria or Acharis Avtonomiuri Respublika (Bat'umi)|Akhalgoris|Akhalk'alak'is|Akhalts'ikhis|Akhmetis|Ambrolauris|Aspindzis|Baghdat'is|Bolnisis|Borjomis|Ch'khorotsqus|Ch'okhatauris|Chiat'ura|Dedop'listsqaros|Dmanisis|Dushet'is|Gardabanis|Gori|Goris|Gurjaanis|Javis|K'arelis|K'ut'aisi|Kaspis|Kharagaulis|Khashuris|Khobis|Khonis|Lagodekhis|Lanch'khut'is|Lentekhis|Marneulis|Martvilis|Mestiis|Mts'khet'is|Ninotsmindis|Onis|Ozurget'is|P'ot'i|Qazbegis|Qvarlis|Rust'avi|Sach'kheris|Sagarejos|Samtrediis|Senakis|Sighnaghis|T'bilisi|T'elavis|T'erjolis|T'et'ritsqaros|T'ianet'is|Tqibuli|Ts'ageris|Tsalenjikhis|Tsalkis|Tsqaltubo|Vanis|Zestap'onis|Zugdidi|Zugdidis"; -aStates[83]="|Baden-Württemberg|Bayern|Berlin|Brandenburg|Bremen|Hamburg|Hessen|Mecklenburg-Vorpommern|Niedersachsen|Nordrhein-Westfalen|Rheinland-Pfalz|Saarland|Sachsen|Sachsen-Anhalt|Schleswig-Holstein|Thüringen"; -aStates[84]="|Ashanti|Brong-Ahafo|Central|Eastern|Greater Accra|Northern|Upper East|Upper West|Volta|Western"; -aStates[85]="|Gibraltar"; -aStates[86]="|Ile du Lys|Ile Glorieuse"; -aStates[87]="|Aitolia kai Akarnania|Akhaia|Argolis|Arkadhia|Arta|Attiki|Ayion Oros (Mt. Athos)|Dhodhekanisos|Drama|Evritania|Evros|Evvoia|Florina|Fokis|Fthiotis|Grevena|Ilia|Imathia|Ioannina|Irakleion|Kardhitsa|Kastoria|Kavala|Kefallinia|Kerkyra|Khalkidhiki|Khania|Khios|Kikladhes|Kilkis|Korinthia|Kozani|Lakonia|Larisa|Lasithi|Lesvos|Levkas|Magnisia|Messinia|Pella|Pieria|Preveza|Rethimni|Rodhopi|Samos|Serrai|Thesprotia|Thessaloniki|Trikala|Voiotia|Xanthi|Zakinthos"; -aStates[88]="|Avannaa (Nordgronland)|Kitaa (Vestgronland)|Tunu (Ostgronland)" -aStates[89]="|Carriacou and Petit Martinique|Saint Andrew|Saint David|Saint George|Saint John|Saint Mark|Saint Patrick"; -aStates[90]="|Basse-Terre|Grande-Terre|Îles de la Petite Terre|Îles des Saintes|Marie-Galante"; -aStates[91]="|Guam"; -aStates[92]="|Alta Verapaz|Baja Verapaz|Chimaltenango|Chiquimula|El Progreso|Escuintla|Guatemala|Huehuetenango|Izabal|Jalapa|Jutiapa|Peten|Quetzaltenango|Quiche|Retalhuleu|Sacatepequez|San Marcos|Santa Rosa|Solola|Suchitepequez|Totonicapan|Zacapa"; -aStates[93]="|Castel|Forest|St. Andrew|St. Martin|St. Peter Port|St. Pierre du Bois|St. Sampson|St. Saviour|Torteval|Vale"; -aStates[94]="|Beyla|Boffa|Boke|Conakry|Coyah|Dabola|Dalaba|Dinguiraye|Dubreka|Faranah|Forecariah|Fria|Gaoual|Gueckedou|Kankan|Kerouane|Kindia|Kissidougou|Koubia|Koundara|Kouroussa|Labe|Lelouma|Lola|Macenta|Mali|Mamou|Mandiana|Nzerekore|Pita|Siguiri|Telimele|Tougue|Yomou"; -aStates[95]="|Bafata|Biombo|Bissau|Bolama-Bijagos|Cacheu|Gabu|Oio|Quinara|Tombali"; -aStates[96]="|Barima-Waini|Cuyuni-Mazaruni|Demerara-Mahaica|East Berbice-Corentyne|Essequibo Islands-West Demerara|Mahaica-Berbice|Pomeroon-Supenaam|Potaro-Siparuni|Upper Demerara-Berbice|Upper Takutu-Upper Essequibo"; -aStates[97]="|Artibonite|Centre|Grand'Anse|Nord|Nord-Est|Nord-Ouest|Ouest|Sud|Sud-Est"; -aStates[98]="|Heard Island and McDonald Islands"; -aStates[99]="|Holy See (Vatican City)" -aStates[100]="|Atlantida|Choluteca|Colon|Comayagua|Copan|Cortes|El Paraiso|Francisco Morazan|Gracias a Dios|Intibuca|Islas de la Bahia|La Paz|Lempira|Ocotepeque|Olancho|Santa Barbara|Valle|Yoro"; -aStates[101]="|Hong Kong"; -aStates[102]="|Howland Island"; -aStates[103]="|Bacs-Kiskun|Baranya|Bekes|Bekescsaba|Borsod-Abauj-Zemplen|Budapest|Csongrad|Debrecen|Dunaujvaros|Eger|Fejer|Gyor|Gyor-Moson-Sopron|Hajdu-Bihar|Heves|Hodmezovasarhely|Jasz-Nagykun-Szolnok|Kaposvar|Kecskemet|Komarom-Esztergom|Miskolc|Nagykanizsa|Nograd|Nyiregyhaza|Pecs|Pest|Somogy|Sopron|Szabolcs-Szatmar-Bereg|Szeged|Szekesfehervar|Szolnok|Szombathely|Tatabanya|Tolna|Vas|Veszprem|Veszprem (City)|Zala|Zalaegerszeg"; -aStates[104]="|Akranes|Akureyri|Arnessysla|Austur-Bardhastrandarsysla|Austur-Hunavatnssysla|Austur-Skaftafellssysla|Borgarfjardharsysla|Dalasysla|Eyjafjardharsysla|Gullbringusysla|Hafnarfjordhur|Husavik|Isafjordhur|Keflavik|Kjosarsysla|Kopavogur|Myrasysla|Neskaupstadhur|Nordhur-Isafjardharsysla|Nordhur-Mulasys-la|Nordhur-Thingeyjarsysla|Olafsfjordhur|Rangarvallasysla|Reykjavik|Saudharkrokur|Seydhisfjordhur|Siglufjordhur|Skagafjardharsysla|Snaefellsnes-og Hnappadalssysla|Strandasysla|Sudhur-Mulasysla|Sudhur-Thingeyjarsysla|Vesttmannaeyjar|Vestur-Bardhastrandarsysla|Vestur-Hunavatnssysla|Vestur-Isafjardharsysla|Vestur-Skaftafellssysla"; -aStates[105]="|Andaman and Nicobar Islands|Andhra Pradesh|Arunachal Pradesh|Assam|Bihar|Chandigarh|Chhattisgarh|Dadra and Nagar Haveli|Daman and Diu|Delhi|Goa|Gujarat|Haryana|Himachal Pradesh|Jammu and Kashmir|Jharkhand|Karnataka|Kerala|Lakshadweep|Madhya Pradesh|Maharashtra|Manipur|Meghalaya|Mizoram|Nagaland|Orissa|Pondicherry|Punjab|Rajasthan|Sikkim|Tamil Nadu|Tripura|Uttar Pradesh|Uttaranchal|West Bengal"; -aStates[106]="|Aceh|Bali|Banten|Bengkulu|East Timor|Gorontalo|Irian Jaya|Jakarta Raya|Jambi|Jawa Barat|Jawa Tengah|Jawa Timur|Kalimantan Barat|Kalimantan Selatan|Kalimantan Tengah|Kalimantan Timur|Kepulauan Bangka Belitung|Lampung|Maluku|Maluku Utara|Nusa Tenggara Barat|Nusa Tenggara Timur|Riau|Sulawesi Selatan|Sulawesi Tengah|Sulawesi Tenggara|Sulawesi Utara|Sumatera Barat|Sumatera Selatan|Sumatera Utara|Yogyakarta"; -aStates[107]="|Ardabil|Azarbayjan-e Gharbi|Azarbayjan-e Sharqi|Bushehr|Chahar Mahall va Bakhtiari|Esfahan|Fars|Gilan|Golestan|Hamadan|Hormozgan|Ilam|Kerman|Kermanshah|Khorasan|Khuzestan|Kohgiluyeh va Buyer Ahmad|Kordestan|Lorestan|Markazi|Mazandaran|Qazvin|Qom|Semnan|Sistan va Baluchestan|Tehran|Yazd|Zanjan"; -aStates[108]="|Al Anbar|Al Basrah|Al Muthanna|Al Qadisiyah|An Najaf|Arbil|As Sulaymaniyah|At Ta'mim|Babil|Baghdad|Dahuk|Dhi Qar|Diyala|Karbala'|Maysan|Ninawa|Salah ad Din|Wasit"; -aStates[109]="|Antrim|Armargh|Carlow|Cavan|Clare|Cork|Derry|Donegal|Down|Dún Laoghaire–Rathdown|Fermanagh|Dublin|Fingal|Galway|Kerry|Kildare|Kilkenny|Laois|Leitrim|Limerick|Longford|Louth|Mayo|Meath|Monaghan|Offaly|Roscommon|Sligo|Tipperary|Tyrone|Waterford|Westmeath|Wexford|Wicklow"; -aStates[110]="|Antrim|Armagh|Belfast|Down|Fermanagh|Londonderry|Tyrone"; -aStates[111]="|Central|Haifa|Jerusalem|Northern|Southern|Tel Aviv"; -aStates[112]="|Abruzzi|Basilicata|Calabria|Campania|Emilia-Romagna|Friuli-Venezia Giulia|Lazio|Liguria|Lombardia|Marche|Molise|Piemonte|Puglia|Sardegna|Sicilia|Toscana|Trentino-Alto Adige|Umbria|Valle d'Aosta|Veneto"; -aStates[113]="|Clarendon|Hanover|Kingston|Manchester|Portland|Saint Andrew|Saint Ann|Saint Catherine|Saint Elizabeth|Saint James|Saint Mary|Saint Thomas|Trelawny|Westmoreland"; -aStates[114]="|Jan Mayen"; -aStates[115]="|Aichi|Akita|Aomori|Chiba|Ehime|Fukui|Fukuoka|Fukushima|Gifu|Gumma|Hiroshima|Hokkaido|Hyogo|Ibaraki|Ishikawa|Iwate|Kagawa|Kagoshima|Kanagawa|Kochi|Kumamoto|Kyoto|Mie|Miyagi|Miyazaki|Nagano|Nagasaki|Nara|Niigata|Oita|Okayama|Okinawa|Osaka|Saga|Saitama|Shiga|Shimane|Shizuoka|Tochigi|Tokushima|Tokyo|Tottori|Toyama|Wakayama|Yamagata|Yamaguchi|Yamanashi"; -aStates[116]="|Jarvis Island"; -aStates[117]="|Jersey"; -aStates[118]="|Johnston Atoll"; -aStates[119]="|'Amman|Ajlun|Al 'Aqabah|Al Balqa'|Al Karak|Al Mafraq|At Tafilah|Az Zarqa'|Irbid|Jarash|Ma'an|Madaba"; -aStates[120]="|Juan de Nova Island"; -aStates[121]="|Almaty|Aqmola|Aqtobe|Astana|Atyrau|Batys Qazaqstan|Bayqongyr|Mangghystau|Ongtustik Qazaqstan|Pavlodar|Qaraghandy|Qostanay|Qyzylorda|Shyghys Qazaqstan|Soltustik Qazaqstan|Zhambyl"; -aStates[122]="|Central|Coast|Eastern|Nairobi Area|North Eastern|Nyanza|Rift Valley|Western"; -aStates[123]="|Abaiang|Abemama|Aranuka|Arorae|Banaba (District)|Banaba|Beru|Butaritari|Central Gilberts (District)|Gilbert Islands (Unit)|Kanton|Kiritimati|Kuria|Line Islands (District)|Line Islands (Unit)|Maiana|Makin|Marakei|Nikunau|Nonouti|Northern Gilberts (District)|Onotoa|Phoenix Islands (Unit)|Southern Gilberts (District)|Tabiteuea|Tabuaeran|Tamana|Tarawa (District)|Tarawa|Teraina"; -aStates[124]="|Chagang-do (Chagang Province)|Hamgyong-bukto (North Hamgyong Province)|Hamgyong-namdo (South Hamgyong Province)|Hwanghae-bukto (North Hwanghae Province)|Hwanghae-namdo (South Hwanghae Province)|Kaesong-si (Kaesong City)|Kangwon-do (Kangwon Province)|Namp'o-si (Namp'o City)|P'yongan-bukto (North P'yongan Province)|P'yongan-namdo (South P'yongan Province)|P'yongyang-si (P'yongyang City)|Yanggang-do (Yanggang Province)" -aStates[125]="|Ch'ungch'ong-bukto|Ch'ungch'ong-namdo|Cheju-do|Cholla-bukto|Cholla-namdo|Inch'on-gwangyoksi|Kangwon-do|Kwangju-gwangyoksi|Kyonggi-do|Kyongsang-bukto|Kyongsang-namdo|Pusan-gwangyoksi|Soul-t'ukpyolsi|Taegu-gwangyoksi|Taejon-gwangyoksi|Ulsan-gwangyoksi"; -aStates[126]="|Al 'Asimah|Al Ahmadi|Al Farwaniyah|Al Jahra'|Hawalli"; -aStates[127]="|Batken Oblasty|Bishkek Shaary|Chuy Oblasty (Bishkek)|Jalal-Abad Oblasty|Naryn Oblasty|Osh Oblasty|Talas Oblasty|Ysyk-Kol Oblasty (Karakol)" -aStates[128]="|Attapu|Bokeo|Bolikhamxai|Champasak|Houaphan|Khammouan|Louangnamtha|Louangphabang|Oudomxai|Phongsali|Salavan|Savannakhet|Viangchan City|Viangchan|Xaignabouli|Xaisomboun|Xekong|Xiangkhoang"; -aStates[129]="|Aizkraukles Rajons|Aluksnes Rajons|Balvu Rajons|Bauskas Rajons|Cesu Rajons|Daugavpils|Daugavpils Rajons|Dobeles Rajons|Gulbenes Rajons|Jekabpils Rajons|Jelgava|Jelgavas Rajons|Jurmala|Kraslavas Rajons|Kuldigas Rajons|Leipaja|Liepajas Rajons|Limbazu Rajons|Ludzas Rajons|Madonas Rajons|Ogres Rajons|Preilu Rajons|Rezekne|Rezeknes Rajons|Riga|Rigas Rajons|Saldus Rajons|Talsu Rajons|Tukuma Rajons|Valkas Rajons|Valmieras Rajons|Ventspils|Ventspils Rajons"; -aStates[130]="|Beyrouth|Ech Chimal|Ej Jnoub|El Bekaa|Jabal Loubnane"; -aStates[131]="|Berea|Butha-Buthe|Leribe|Mafeteng|Maseru|Mohales Hoek|Mokhotlong|Qacha's Nek|Quthing|Thaba-Tseka"; -aStates[132]="|Bomi|Bong|Grand Bassa|Grand Cape Mount|Grand Gedeh|Grand Kru|Lofa|Margibi|Maryland|Montserrado|Nimba|River Cess|Sinoe"; -aStates[133]="|Ajdabiya|Al 'Aziziyah|Al Fatih|Al Jabal al Akhdar|Al Jufrah|Al Khums|Al Kufrah|An Nuqat al Khams|Ash Shati'|Awbari|Az Zawiyah|Banghazi|Darnah|Ghadamis|Gharyan|Misratah|Murzuq|Sabha|Sawfajjin|Surt|Tarabulus|Tarhunah|Tubruq|Yafran|Zlitan"; -aStates[134]="|Balzers|Eschen|Gamprin|Mauren|Planken|Ruggell|Schaan|Schellenberg|Triesen|Triesenberg|Vaduz"; -aStates[135]="|Akmenes Rajonas|Alytaus Rajonas|Alytus|Anyksciu Rajonas|Birstonas|Birzu Rajonas|Druskininkai|Ignalinos Rajonas|Jonavos Rajonas|Joniskio Rajonas|Jurbarko Rajonas|Kaisiadoriu Rajonas|Kaunas|Kauno Rajonas|Kedainiu Rajonas|Kelmes Rajonas|Klaipeda|Klaipedos Rajonas|Kretingos Rajonas|Kupiskio Rajonas|Lazdiju Rajonas|Marijampole|Marijampoles Rajonas|Mazeikiu Rajonas|Moletu Rajonas|Neringa Pakruojo Rajonas|Palanga|Panevezio Rajonas|Panevezys|Pasvalio Rajonas|Plunges Rajonas|Prienu Rajonas|Radviliskio Rajonas|Raseiniu Rajonas|Rokiskio Rajonas|Sakiu Rajonas|Salcininku Rajonas|Siauliai|Siauliu Rajonas|Silales Rajonas|Silutes Rajonas|Sirvintu Rajonas|Skuodo Rajonas|Svencioniu Rajonas|Taurages Rajonas|Telsiu Rajonas|Traku Rajonas|Ukmerges Rajonas|Utenos Rajonas|Varenos Rajonas|Vilkaviskio Rajonas|Vilniaus Rajonas|Vilnius|Zarasu Rajonas"; -aStates[136]="|Diekirch|Grevenmacher|Luxembourg"; -aStates[137]="|Macau"; -aStates[138]="|Aracinovo|Bac|Belcista|Berovo|Bistrica|Bitola|Blatec|Bogdanci|Bogomila|Bogovinje|Bosilovo|Brvenica|Cair (Skopje)|Capari|Caska|Cegrane|Centar (Skopje)|Centar Zupa|Cesinovo|Cucer-Sandevo|Debar|Delcevo|Delogozdi|Demir Hisar|Demir Kapija|Dobrusevo|Dolna Banjica|Dolneni|Dorce Petrov (Skopje)|Drugovo|Dzepciste|Gazi Baba (Skopje)|Gevgelija|Gostivar|Gradsko|Ilinden|Izvor|Jegunovce|Kamenjane|Karbinci|Karpos (Skopje)|Kavadarci|Kicevo|Kisela Voda (Skopje)|Klecevce|Kocani|Konce|Kondovo|Konopiste|Kosel|Kratovo|Kriva Palanka|Krivogastani|Krusevo|Kuklis|Kukurecani|Kumanovo|Labunista|Lipkovo|Lozovo|Lukovo|Makedonska Kamenica|Makedonski Brod|Mavrovi Anovi|Meseista|Miravci|Mogila|Murtino|Negotino|Negotino-Poloska|Novaci|Novo Selo|Oblesevo|Ohrid|Orasac|Orizari|Oslomej|Pehcevo|Petrovec|Plasnia|Podares|Prilep|Probistip|Radovis|Rankovce|Resen|Rosoman|Rostusa|Samokov|Saraj|Sipkovica|Sopiste|Sopotnika|Srbinovo|Star Dojran|Staravina|Staro Nagoricane|Stip|Struga|Strumica|Studenicani|Suto Orizari (Skopje)|Sveti Nikole|Tearce|Tetovo|Topolcani|Valandovo|Vasilevo|Veles|Velesta|Vevcani|Vinica|Vitoliste|Vranestica|Vrapciste|Vratnica|Vrutok|Zajas|Zelenikovo|Zileno|Zitose|Zletovo|Zrnovci"; -aStates[139]="|Antananarivo|Antsiranana|Fianarantsoa|Mahajanga|Toamasina|Toliara"; -aStates[140]="|Balaka|Blantyre|Chikwawa|Chiradzulu|Chitipa|Dedza|Dowa|Karonga|Kasungu|Likoma|Lilongwe|Machinga (Kasupe)|Mangochi|Mchinji|Mulanje|Mwanza|Mzimba|Nkhata Bay|Nkhotakota|Nsanje|Ntcheu|Ntchisi|Phalombe|Rumphi|Salima|Thyolo|Zomba"; -aStates[141]="|Johor|Kedah|Kelantan|Labuan|Melaka|Negeri Sembilan|Pahang|Perak|Perlis|Pulau Pinang|Sabah|Sarawak|Selangor|Terengganu|Wilayah Persekutuan"; -aStates[142]="|Alifu|Baa|Dhaalu|Faafu|Gaafu Alifu|Gaafu Dhaalu|Gnaviyani|Haa Alifu|Haa Dhaalu|Kaafu|Laamu|Lhaviyani|Maale|Meemu|Noonu|Raa|Seenu|Shaviyani|Thaa|Vaavu"; -aStates[143]="|Gao|Kayes|Kidal|Koulikoro|Mopti|Segou|Sikasso|Tombouctou"; -aStates[144]="|Valletta"; -aStates[145]="|Man, Isle of"; -aStates[146]="|Ailinginae|Ailinglaplap|Ailuk|Arno|Aur|Bikar|Bikini|Bokak|Ebon|Enewetak|Erikub|Jabat|Jaluit|Jemo|Kili|Kwajalein|Lae|Lib|Likiep|Majuro|Maloelap|Mejit|Mili|Namorik|Namu|Rongelap|Rongrik|Toke|Ujae|Ujelang|Utirik|Wotho|Wotje"; -aStates[147]="|Martinique"; -aStates[148]="|Adrar|Assaba|Brakna|Dakhlet Nouadhibou|Gorgol|Guidimaka|Hodh Ech Chargui|Hodh El Gharbi|Inchiri|Nouakchott|Tagant|Tiris Zemmour|Trarza"; -aStates[149]="|Agalega Islands|Black River|Cargados Carajos Shoals|Flacq|Grand Port|Moka|Pamplemousses|Plaines Wilhems|Port Louis|Riviere du Rempart|Rodrigues|Savanne"; -aStates[150]="|Mayotte"; -aStates[151]="|Aguascalientes|Baja California|Baja California Sur|Campeche|Chiapas|Chihuahua|Coahuila de Zaragoza|Colima|Distrito Federal|Durango|Guanajuato|Guerrero|Hidalgo|Jalisco|Mexico|Michoacan de Ocampo|Morelos|Nayarit|Nuevo Leon|Oaxaca|Puebla|Queretaro de Arteaga|Quintana Roo|San Luis Potosi|Sinaloa|Sonora|Tabasco|Tamaulipas|Tlaxcala|Veracruz-Llave|Yucatan|Zacatecas"; -aStates[152]="|Chuuk (Truk)|Kosrae|Pohnpei|Yap"; -aStates[153]="|Midway Islands"; -aStates[154]="|Balti|Cahul|Chisinau (City)|Chisinau|Dubasari|Edinet|Gagauzia|Lapusna|Orhei|Soroca|Tighina|Ungheni"; -aStates[155]="|Fontvieille|La Condamine|Monaco-Ville|Monte-Carlo"; -aStates[156]="|Arhangay|Bayan-Olgiy|Bayanhongor|Bulgan|Darhan|Dornod|Dornogovi|Dundgovi|Dzavhan|Erdenet|Govi-Altay|Hentiy|Hovd|Hovsgol|Omnogovi|Ovorhangay|Selenge|Suhbaatar|Tov|Ulaanbaatar|Uvs"; -aStates[157]="|Saint Anthony|Saint Georges|Saint Peter's"; -aStates[158]="|Agadir|Al Hoceima|Azilal|Ben Slimane|Beni Mellal|Boulemane|Casablanca|Chaouen|El Jadida|El Kelaa des Srarhna|Er Rachidia|Essaouira|Fes|Figuig|Guelmim|Ifrane|Kenitra|Khemisset|Khenifra|Khouribga|Laayoune|Larache|Marrakech|Meknes|Nador|Ouarzazate|Oujda|Rabat-Sale|Safi|Settat|Sidi Kacem|Tan-Tan|Tanger|Taounate|Taroudannt|Tata|Taza|Tetouan|Tiznit"; -aStates[159]="|Cabo Delgado|Gaza|Inhambane|Manica|Maputo|Nampula|Niassa|Sofala|Tete|Zambezia"; -aStates[160]="|Caprivi|Erongo|Hardap|Karas|Khomas|Kunene|Ohangwena|Okavango|Omaheke|Omusati|Oshana|Oshikoto|Otjozondjupa"; -aStates[161]="|Aiwo|Anabar|Anetan|Anibare|Baiti|Boe|Buada|Denigomodu|Ewa|Ijuw|Meneng|Nibok|Uaboe|Yaren"; -aStates[162]="|Bagmati|Bheri|Dhawalagiri|Gandaki|Janakpur|Karnali|Kosi|Lumbini|Mahakali|Mechi|Narayani|Rapti|Sagarmatha|Seti"; -aStates[163]="|Drenthe|Flevoland|Friesland|Gelderland|Groningen|Limburg|Noord-Brabant|Noord-Holland|Overijssel|Utrecht|Zeeland|Zuid-Holland"; -aStates[164]="|Netherlands Antilles"; -aStates[165]="|Iles Loyaute|Nord|Sud"; -aStates[166]="|Akaroa|Amuri|Ashburton|Bay of Islands|Bruce|Buller|Chatham Islands|Cheviot|Clifton|Clutha|Cook|Dannevirke|Egmont|Eketahuna|Ellesmere|Eltham|Eyre|Featherston|Franklin|Golden Bay|Great Barrier Island|Grey|Hauraki Plains|Hawera|Hawke's Bay|Heathcote|Hikurangi|Hobson|Hokianga|Horowhenua|Hurunui|Hutt|Inangahua|Inglewood|Kaikoura|Kairanga|Kiwitea|Lake|Mackenzie|Malvern|Manaia|Manawatu|Mangonui|Maniototo|Marlborough|Masterton|Matamata|Mount Herbert|Ohinemuri|Opotiki|Oroua|Otamatea|Otorohanga|Oxford|Pahiatua|Paparua|Patea|Piako|Pohangina|Raglan|Rangiora|Rangitikei|Rodney|Rotorua|Runanga|Saint Kilda|Silverpeaks|Southland|Stewart Island|Stratford|Strathallan|Taranaki|Taumarunui|Taupo|Tauranga|Thames-Coromandel|Tuapeka|Vincent|Waiapu|Waiheke|Waihemo|Waikato|Waikohu|Waimairi|Waimarino|Waimate|Waimate West|Waimea|Waipa|Waipawa|Waipukurau|Wairarapa South|Wairewa|Wairoa|Waitaki|Waitomo|Waitotara|Wallace|Wanganui|Waverley|Westland|Whakatane|Whangarei|Whangaroa|Woodville"; -aStates[167]="|Atlantico Norte|Atlantico Sur|Boaco|Carazo|Chinandega|Chontales|Esteli|Granada|Jinotega|Leon|Madriz|Managua|Masaya|Matagalpa|Nueva Segovia|Rio San Juan|Rivas"; -aStates[168]="|Agadez|Diffa|Dosso|Maradi|Niamey|Tahoua|Tillaberi|Zinder"; -aStates[169]="|Abia|Abuja Federal Capital Territory|Adamawa|Akwa Ibom|Anambra|Bauchi|Bayelsa|Benue|Borno|Cross River|Delta|Ebonyi|Edo|Ekiti|Enugu|Gombe|Imo|Jigawa|Kaduna|Kano|Katsina|Kebbi|Kogi|Kwara|Lagos|Nassarawa|Niger|Ogun|Ondo|Osun|Oyo|Plateau|Rivers|Sokoto|Taraba|Yobe|Zamfara"; -aStates[170]="|Niue"; -aStates[171]="|Norfolk Island"; -aStates[172]="|Northern Islands|Rota|Saipan|Tinian"; -aStates[173]="|Akershus|Aust-Agder|Buskerud|Finnmark|Hedmark|Hordaland|More og Romsdal|Nord-Trondelag|Nordland|Oppland|Oslo|Ostfold|Rogaland|Sogn og Fjordane|Sor-Trondelag|Telemark|Troms|Vest-Agder|Vestfold"; -aStates[174]="|Ad Dakhiliyah|Al Batinah|Al Wusta|Ash Sharqiyah|Az Zahirah|Masqat|Musandam|Zufar"; -aStates[175]="|Balochistan|Federally Administered Tribal Areas|Islamabad Capital Territory|North-West Frontier Province|Punjab|Sindh"; -aStates[176]="|Aimeliik|Airai|Angaur|Hatobohei|Kayangel|Koror|Melekeok|Ngaraard|Ngarchelong|Ngardmau|Ngatpang|Ngchesar|Ngeremlengui|Ngiwal|Palau Island|Peleliu|Sonsoral|Tobi"; -aStates[177]="|Bocas del Toro|Chiriqui|Cocle|Colon|Darien|Herrera|Los Santos|Panama|San Blas|Veraguas"; -aStates[178]="|Bougainville|Central|Chimbu|East New Britain|East Sepik|Eastern Highlands|Enga|Gulf|Madang|Manus|Milne Bay|Morobe|National Capital|New Ireland|Northern|Sandaun|Southern Highlands|West New Britain|Western|Western Highlands"; -aStates[179]="|Alto Paraguay|Alto Parana|Amambay|Asuncion (city)|Boqueron|Caaguazu|Caazapa|Canindeyu|Central|Concepcion|Cordillera|Guaira|Itapua|Misiones|Neembucu|Paraguari|Presidente Hayes|San Pedro"; -aStates[180]="|Amazonas|Ancash|Apurimac|Arequipa|Ayacucho|Cajamarca|Callao|Cusco|Huancavelica|Huanuco|Ica|Junin|La Libertad|Lambayeque|Lima|Loreto|Madre de Dios|Moquegua|Pasco|Piura|Puno|San Martin|Tacna|Tumbes|Ucayali"; -aStates[181]="|Abra|Agusan del Norte|Agusan del Sur|Aklan|Albay|Angeles|Antique|Aurora|Bacolod|Bago|Baguio|Bais|Basilan|Basilan City|Bataan|Batanes|Batangas|Batangas City|Benguet|Bohol|Bukidnon|Bulacan|Butuan|Cabanatuan|Cadiz|Cagayan|Cagayan de Oro|Calbayog|Caloocan|Camarines Norte|Camarines Sur|Camiguin|Canlaon|Capiz|Catanduanes|Cavite|Cavite City|Cebu|Cebu City|Cotabato|Dagupan|Danao|Dapitan|Davao City Davao|Davao del Sur|Davao Oriental|Dipolog|Dumaguete|Eastern Samar|General Santos|Gingoog|Ifugao|Iligan|Ilocos Norte|Ilocos Sur|Iloilo|Iloilo City|Iriga|Isabela|Kalinga-Apayao|La Carlota|La Union|Laguna|Lanao del Norte|Lanao del Sur|Laoag|Lapu-Lapu|Legaspi|Leyte|Lipa|Lucena|Maguindanao|Mandaue|Manila|Marawi|Marinduque|Masbate|Mindoro Occidental|Mindoro Oriental|Misamis Occidental|Misamis Oriental|Mountain|Naga|Negros Occidental|Negros Oriental|North Cotabato|Northern Samar|Nueva Ecija|Nueva Vizcaya|Olongapo|Ormoc|Oroquieta|Ozamis|Pagadian|Palawan|Palayan|Pampanga|Pangasinan|Pasay|Puerto Princesa|Quezon|Quezon City|Quirino|Rizal|Romblon|Roxas|Samar|San Carlos (in Negros Occidental)|San Carlos (in Pangasinan)|San Jose|San Pablo|Silay|Siquijor|Sorsogon|South Cotabato|Southern Leyte|Sultan Kudarat|Sulu|Surigao|Surigao del Norte|Surigao del Sur|Tacloban|Tagaytay|Tagbilaran|Tangub|Tarlac|Tawitawi|Toledo|Trece Martires|Zambales|Zamboanga|Zamboanga del Norte|Zamboanga del Sur"; -aStates[182]="|Pitcaim Islands"; -aStates[183]="|Dolnoslaskie|Kujawsko-Pomorskie|Lodzkie|Lubelskie|Lubuskie|Malopolskie|Mazowieckie|Opolskie|Podkarpackie|Podlaskie|Pomorskie|Slaskie|Swietokrzyskie|Warminsko-Mazurskie|Wielkopolskie|Zachodniopomorskie"; -aStates[184]="|Acores (Azores)|Aveiro|Beja|Braga|Braganca|Castelo Branco|Coimbra|Evora|Faro|Guarda|Leiria|Lisboa|Madeira|Portalegre|Porto|Santarem|Setubal|Viana do Castelo|Vila Real|Viseu"; -aStates[185]="|Adjuntas|Aguada|Aguadilla|Aguas Buenas|Aibonito|Anasco|Arecibo|Arroyo|Barceloneta|Barranquitas|Bayamon|Cabo Rojo|Caguas|Camuy|Canovanas|Carolina|Catano|Cayey|Ceiba|Ciales|Cidra|Coamo|Comerio|Corozal|Culebra|Dorado|Fajardo|Florida|Guanica|Guayama|Guayanilla|Guaynabo|Gurabo|Hatillo|Hormigueros|Humacao|Isabela|Jayuya|Juana Diaz|Juncos|Lajas|Lares|Las Marias|Las Piedras|Loiza|Luquillo|Manati|Maricao|Maunabo|Mayaguez|Moca|Morovis|Naguabo|Naranjito|Orocovis|Patillas|Penuelas|Ponce|Quebradillas|Rincon|Rio Grande|Sabana Grande|Salinas|San German|San Juan|San Lorenzo|San Sebastian|Santa Isabel|Toa Alta|Toa Baja|Trujillo Alto|Utuado|Vega Alta|Vega Baja|Vieques|Villalba|Yabucoa|Yauco"; -aStates[186]="|Ad Dawhah|Al Ghuwayriyah|Al Jumayliyah|Al Khawr|Al Wakrah|Ar Rayyan|Jarayan al Batinah|Madinat ash Shamal|Umm Salal"; -aStates[187]="|Réunion"; -aStates[188]="|Alba|Arad|Arges|Bacau|Bihor|Bistrita-Nasaud|Botosani|Braila|Brasov|Bucuresti|Buzau|Calarasi|Caras-Severin|Cluj|Constanta|Covasna|Dimbovita|Dolj|Galati|Giurgiu|Gorj|Harghita|Hunedoara|Ialomita|Iasi|Maramures|Mehedinti|Mures|Neamt|Olt|Prahova|Salaj|Satu Mare|Sibiu|Suceava|Teleorman|Timis|Tulcea|Vaslui|Vilcea|Vrancea"; -aStates[189]="|Adygeya (Maykop)|Aginskiy Buryatskiy (Aginskoye)|Altay (Gorno-Altaysk)|Altayskiy (Barnaul)|Amurskaya (Blagoveshchensk)|Arkhangel'skaya|Astrakhanskaya|Bashkortostan (Ufa)|Belgorodskaya|Bryanskaya|Buryatiya (Ulan-Ude)|Chechnya (Groznyy)|Chelyabinskaya|Chitinskaya|Chukotskiy (Anadyr')|Chuvashiya (Cheboksary)|Dagestan (Makhachkala)|Evenkiyskiy (Tura)|Ingushetiya (Nazran')|Irkutskaya|Ivanovskaya|Kabardino-Balkariya (Nal'chik)|Kaliningradskaya|Kalmykiya (Elista)|Kaluzhskaya|Kamchatskaya (Petropavlovsk-Kamchatskiy)|Karachayevo-Cherkesiya (Cherkessk)|Kareliya (Petrozavodsk)|Kemerovskaya|Khabarovskiy|Khakasiya (Abakan)|Khanty-Mansiyskiy (Khanty-Mansiysk)|Kirovskaya|Komi (Syktyvkar)|Komi-Permyatskiy (Kudymkar)|Koryakskiy (Palana)|Kostromskaya|Krasnodarskiy|Krasnoyarskiy|Kurganskaya|Kurskaya|Leningradskaya|Lipetskaya|Magadanskaya|Mariy-El (Yoshkar-Ola)|Mordoviya (Saransk)|Moskovskaya|Moskva (Moscow)|Murmanskaya|Nenetskiy (Nar'yan-Mar)|Nizhegorodskaya|Novgorodskaya|Novosibirskaya|Omskaya|Orenburgskaya|Orlovskaya (Orel)|Penzenskaya|Permskaya|Primorskiy (Vladivostok)|Pskovskaya|Rostovskaya|Ryazanskaya|Sakha (Yakutsk)|Sakhalinskaya (Yuzhno-Sakhalinsk)|Samarskaya|Sankt-Peterburg (Saint Petersburg)|Saratovskaya|Severnaya Osetiya-Alaniya [North Ossetia] (Vladikavkaz)|Smolenskaya|Stavropol'skiy|Sverdlovskaya (Yekaterinburg)|Tambovskaya|Tatarstan (Kazan')|Taymyrskiy (Dudinka)|Tomskaya|Tul'skaya|Tverskaya|Tyumenskaya|Tyva (Kyzyl)|Udmurtiya (Izhevsk)|Ul'yanovskaya|Ust'-Ordynskiy Buryatskiy (Ust'-Ordynskiy)|Vladimirskaya|Volgogradskaya|Vologodskaya|Voronezhskaya|Yamalo-Nenetskiy (Salekhard)|Yaroslavskaya|Yevreyskaya"; -aStates[190]="|Butare|Byumba|Cyangugu|Gikongoro|Gisenyi|Gitarama|Kibungo|Kibuye|Kigali Rurale|Kigali-ville|Ruhengeri|Umutara"; -aStates[191]="|Ascension|Saint Helena|Tristan da Cunha"; -aStates[192]="|Christ Church Nichola Town|Saint Anne Sandy Point|Saint George Basseterre|Saint George Gingerland|Saint James Windward|Saint John Capisterre|Saint John Figtree|Saint Mary Cayon|Saint Paul Capisterre|Saint Paul Charlestown|Saint Peter Basseterre|Saint Thomas Lowland|Saint Thomas Middle Island|Trinity Palmetto Point"; -aStates[193]="|Anse-la-Raye|Castries|Choiseul|Dauphin|Dennery|Gros Islet|Laborie|Micoud|Praslin|Soufriere|Vieux Fort"; -aStates[194]="|Miquelon|Saint Pierre"; -aStates[195]="|Charlotte|Grenadines|Saint Andrew|Saint David|Saint George|Saint Patrick"; -aStates[196]="|A'ana|Aiga-i-le-Tai|Atua|Fa'asaleleaga|Gaga'emauga|Gagaifomauga|Palauli|Satupa'itea|Tuamasaga|Va'a-o-Fonoti|Vaisigano"; -aStates[197]="|Acquaviva|Borgo Maggiore|Chiesanuova|Domagnano|Faetano|Fiorentino|Monte Giardino|San Marino|Serravalle"; -aStates[198]="|Principe|Sao Tome"; -aStates[199]="|'Asir|Al Bahah|Al Hudud ash Shamaliyah|Al Jawf|Al Madinah|Al Qasim|Ar Riyad|Ash Sharqiyah (Eastern Province)|Ha'il|Jizan|Makkah|Najran|Tabuk"; -aStates[200]="|Aberdeenshire|Angus|Argyll|Ayrshire|Banffshire|Berwickshire|Bute|Caithness|Clackmannanshire|Cromartyshire|Dumfriesshire|Dunbartonshire|Dundee City|East Lothian|Edinburgh|Fife|Glasgow City|Inverness-shire|Kincardineshire|Kinross-shire|Kirkcudbrightshire|Lanarkshire|Midlothian|Moray|Nairnshire|Orkney Islands|Peeblesshire|Perthshire|Renfrewshire|Ross and Cromarty|Ross-shire|Roxburghshire|Selkirkshire|Shetland Islands|Stirlingshire|Sutherland|West Lothian|Wigtownshire"; -aStates[201]="|Dakar|Diourbel|Fatick|Kaolack|Kolda|Louga|Saint-Louis|Tambacounda|Thies|Ziguinchor"; -aStates[202]="|Anse aux Pins|Anse Boileau|Anse Etoile|Anse Louis|Anse Royale|Baie Lazare|Baie Sainte Anne|Beau Vallon|Bel Air|Bel Ombre|Cascade|Glacis|Grand' Anse (on Mahe)|Grand' Anse (on Praslin)|La Digue|La Riviere Anglaise|Mont Buxton|Mont Fleuri|Plaisance|Pointe La Rue|Port Glaud|Saint Louis|Takamaka"; -aStates[203]="|Eastern|Northern|Southern|Western"; -aStates[204]="|Singapore"; -aStates[205]="|Banskobystricky|Bratislavsky|Kosicky|Nitriansky|Presovsky|Trenciansky|Trnavsky|Zilinsky"; -aStates[206]="|Ajdovscina|Beltinci|Bled|Bohinj|Borovnica|Bovec|Brda|Brezice|Brezovica|Cankova-Tisina|Celje|Cerklje na Gorenjskem|Cerknica|Cerkno|Crensovci|Crna na Koroskem|Crnomelj|Destrnik-Trnovska Vas|Divaca|Dobrepolje|Dobrova-Horjul-Polhov Gradec|Dol pri Ljubljani|Domzale|Dornava|Dravograd|Duplek|Gorenja Vas-Poljane|Gorisnica|Gornja Radgona|Gornji Grad|Gornji Petrovci|Grosuplje|Hodos Salovci|Hrastnik|Hrpelje-Kozina|Idrija|Ig|Ilirska Bistrica|Ivancna Gorica|Izola|Jesenice|Jursinci|Kamnik|Kanal|Kidricevo|Kobarid|Kobilje|Kocevje|Komen|Koper|Kozje|Kranj|Kranjska Gora|Krsko|Kungota|Kuzma|Lasko|Lenart|Lendava|Litija|Ljubljana|Ljubno|Ljutomer|Logatec|Loska Dolina|Loski Potok|Luce|Lukovica|Majsperk|Maribor|Medvode|Menges|Metlika|Mezica|Miren-Kostanjevica|Mislinja|Moravce|Moravske Toplice|Mozirje|Murska Sobota|Muta|Naklo|Nazarje|Nova Gorica|Novo Mesto|Odranci|Ormoz|Osilnica|Pesnica|Piran|Pivka|Podcetrtek|Podvelka-Ribnica|Postojna|Preddvor|Ptuj|Puconci|Race-Fram|Radece|Radenci|Radlje ob Dravi|Radovljica|Ravne-Prevalje|Ribnica|Rogasevci|Rogaska Slatina|Rogatec|Ruse|Semic|Sencur|Sentilj|Sentjernej|Sentjur pri Celju|Sevnica|Sezana|Skocjan|Skofja Loka|Skofljica|Slovenj Gradec|Slovenska Bistrica|Slovenske Konjice|Smarje pri Jelsah|Smartno ob Paki|Sostanj|Starse|Store|Sveti Jurij|Tolmin|Trbovlje|Trebnje|Trzic|Turnisce|Velenje|Velike Lasce|Videm|Vipava|Vitanje|Vodice|Vojnik|Vrhnika|Vuzenica|Zagorje ob Savi|Zalec|Zavrc|Zelezniki|Ziri|Zrece"; -aStates[207]="|Bellona|Central|Choiseul (Lauru)|Guadalcanal|Honiara|Isabel|Makira|Malaita|Rennell|Temotu|Western"; -aStates[208]="|Awdal|Bakool|Banaadir|Bari|Bay|Galguduud|Gedo|Hiiraan|Jubbada Dhexe|Jubbada Hoose|Mudug|Nugaal|Sanaag|Shabeellaha Dhexe|Shabeellaha Hoose|Sool|Togdheer|Woqooyi Galbeed"; -aStates[209]="|Eastern Cape|Free State|Gauteng|KwaZulu-Natal|Mpumalanga|North-West|Northern Cape|Northern Province|Western Cape"; -aStates[210]="|Bird Island|Bristol Island|Clerke Rocks|Montagu Island|Saunders Island|South Georgia|Southern Thule|Traversay Islands"; -aStates[211]="|Andalucia|Aragon|Asturias|Ceuta|Islas Baleares|Islas Chafarinas|Islas Canarias|Cantabria|Castilla y Leon|Castilla-La Mancha|Catalunya|Extremadura|Galicia|La Rioja|Madrid|Melilla|Murcia|Navarra|Pais Vasco|Peñón de Alhucemas|Peñón de Vélez de la Gomera|Valencia"; -aStates[212]="|Spratly Islands"; -aStates[213]="|Central|Eastern|North Central|North Eastern|North Western|Northern|Sabaragamuwa|Southern|Uva|Western"; -aStates[214]="|A'ali an Nil|Al Bahr al Ahmar|Al Buhayrat|Al Jazirah|Al Khartum|Al Qadarif|Al Wahdah|An Nil al Abyad|An Nil al Azraq|Ash Shamaliyah|Bahr al Jabal|Gharb al Istiwa'iyah|Gharb Bahr al Ghazal|Gharb Darfur|Gharb Kurdufan|Janub Darfur|Janub Kurdufan|Junqali|Kassala|Nahr an Nil|Shamal Bahr al Ghazal|Shamal Darfur|Shamal Kurdufan|Sharq al Istiwa'iyah|Sinnar|Warab"; -aStates[215]="|Brokopondo|Commewijne|Coronie|Marowijne|Nickerie|Para|Paramaribo|Saramacca|Sipaliwini|Wanica"; -aStates[216]="|Barentsoya|Bjornoya|Edgeoya|Hopen|Kvitoya|Nordaustandet|Prins Karls Forland|Spitsbergen"; -aStates[217]="|Hhohho|Lubombo|Manzini|Shiselweni"; -aStates[218]="|Blekinge|Dalarnas|Gavleborgs|Gotlands|Hallands|Jamtlands|Jonkopings|Kalmar|Kronobergs|Norrbottens|Orebro|Ostergotlands|Skane|Sodermanlands|Stockholms|Uppsala|Varmlands|Vasterbottens|Vasternorrlands|Vastmanlands|Vastra Gotalands"; -aStates[219]="|Aargau|Ausser-Rhoden|Basel-Landschaft|Basel-Stadt|Bern|Fribourg|Geneve|Glarus|Graubunden|Inner-Rhoden|Jura|Luzern|Neuchatel|Nidwalden|Obwalden|Sankt Gallen|Schaffhausen|Schwyz|Solothurn|Thurgau|Ticino|Uri|Valais|Vaud|Zug|Zurich"; -aStates[220]="|Al Hasakah|Al Ladhiqiyah|Al Qunaytirah|Ar Raqqah|As Suwayda'|Dar'a|Dayr az Zawr|Dimashq|Halab|Hamah|Hims|Idlib|Rif Dimashq|Tartus"; -aStates[221]="|Chang-hua|Chi-lung|Chia-i (City)|Chia-i|Chung-hsing-hsin-ts'un|Hsin-chu (City)|Hsin-chu|Hua-lien|I-lan|Kao-hsiung (City)|Kao-hsiung|Miao-li|Nan-t'ou|P'eng-hu|P'ing-tung|T'ai-chung (City)|T'ai-chung|T'ai-nan (City)|T'ai-nan|T'ai-pei (City)|T'ai-pei|T'ai-tung|T'ao-yuan|Yun-lin"; -aStates[222]="|Viloyati Khatlon|Viloyati Leninobod|Viloyati Mukhtori Kuhistoni Badakhshon"; -aStates[223]="|Arusha|Dar es Salaam|Dodoma|Iringa|Kagera|Kigoma|Kilimanjaro|Lindi|Mara|Mbeya|Morogoro|Mtwara|Mwanza|Pemba North|Pemba South|Pwani|Rukwa|Ruvuma|Shinyanga|Singida|Tabora|Tanga|Zanzibar Central/South|Zanzibar North|Zanzibar Urban/West"; -aStates[224]="|Amnat Charoen|Ang Thong|Buriram|Chachoengsao|Chai Nat|Chaiyaphum|Chanthaburi|Chiang Mai|Chiang Rai|Chon Buri|Chumphon|Kalasin|Kamphaeng Phet|Kanchanaburi|Khon Kaen|Krabi|Krung Thep Mahanakhon (Bangkok)|Lampang|Lamphun|Loei|Lop Buri|Mae Hong Son|Maha Sarakham|Mukdahan|Nakhon Nayok|Nakhon Pathom|Nakhon Phanom|Nakhon Ratchasima|Nakhon Sawan|Nakhon Si Thammarat|Nan|Narathiwat|Nong Bua Lamphu|Nong Khai|Nonthaburi|Pathum Thani|Pattani|Phangnga|Phatthalung|Phayao|Phetchabun|Phetchaburi|Phichit|Phitsanulok|Phra Nakhon Si Ayutthaya|Phrae|Phuket|Prachin Buri|Prachuap Khiri Khan|Ranong|Ratchaburi|Rayong|Roi Et|Sa Kaeo|Sakon Nakhon|Samut Prakan|Samut Sakhon|Samut Songkhram|Sara Buri|Satun|Sing Buri|Sisaket|Songkhla|Sukhothai|Suphan Buri|Surat Thani|Surin|Tak|Trang|Trat|Ubon Ratchathani|Udon Thani|Uthai Thani|Uttaradit|Yala|Yasothon"; -aStates[225]="|Tobago"; -aStates[226]="|De La Kara|Des Plateaux|Des Savanes|Du Centre|Maritime"; -aStates[227]="|Atafu|Fakaofo|Nukunonu"; -aStates[228]="|Ha'apai|Tongatapu|Vava'u"; -aStates[229]="|Arima|Caroni|Mayaro|Nariva|Port-of-Spain|Saint Andrew|Saint David|Saint George|Saint Patrick|San Fernando|Victoria"; -aStates[230]="|Ariana|Beja|Ben Arous|Bizerte|El Kef|Gabes|Gafsa|Jendouba|Kairouan|Kasserine|Kebili|Mahdia|Medenine|Monastir|Nabeul|Sfax|Sidi Bou Zid|Siliana|Sousse|Tataouine|Tozeur|Tunis|Zaghouan"; -aStates[231]="|Adana|Adiyaman|Afyon|Agri|Aksaray|Amasya|Ankara|Antalya|Ardahan|Artvin|Aydin|Balikesir|Bartin|Batman|Bayburt|Bilecik|Bingol|Bitlis|Bolu|Burdur|Bursa|Canakkale|Cankiri|Corum|Denizli|Diyarbakir|Duzce|Edirne|Elazig|Erzincan|Erzurum|Eskisehir|Gaziantep|Giresun|Gumushane|Hakkari|Hatay|Icel|Igdir|Isparta|Istanbul|Izmir|Kahramanmaras|Karabuk|Karaman|Kars|Kastamonu|Kayseri|Kilis|Kirikkale|Kirklareli|Kirsehir|Kocaeli|Konya|Kutahya|Malatya|Manisa|Mardin|Mugla|Mus|Nevsehir|Nigde|Ordu|Osmaniye|Rize|Sakarya|Samsun|Sanliurfa|Siirt|Sinop|Sirnak|Sivas|Tekirdag|Tokat|Trabzon|Tunceli|Usak|Van|Yalova|Yozgat|Zonguldak"; -aStates[232]="|Ahal Welayaty|Balkan Welayaty|Dashhowuz Welayaty|Lebap Welayaty|Mary Welayaty"; -aStates[233]="|Tuvalu"; -aStates[234]="|Adjumani|Apac|Arua|Bugiri|Bundibugyo|Bushenyi|Busia|Gulu|Hoima|Iganga|Jinja|Kabale|Kabarole|Kalangala|Kampala|Kamuli|Kapchorwa|Kasese|Katakwi|Kibale|Kiboga|Kisoro|Kitgum|Kotido|Kumi|Lira|Luwero|Masaka|Masindi|Mbale|Mbarara|Moroto|Moyo|Mpigi|Mubende|Mukono|Nakasongola|Nebbi|Ntungamo|Pallisa|Rakai|Rukungiri|Sembabule|Soroti|Tororo"; -aStates[235]="|Avtonomna Respublika Krym (Simferopol')|Cherkas'ka (Cherkasy)|Chernihivs'ka (Chernihiv)|Chernivets'ka (Chernivtsi)|Dnipropetrovs'ka (Dnipropetrovs'k)|Donets'ka (Donets'k)|Ivano-Frankivs'ka (Ivano-Frankivs'k)|Kharkivs'ka (Kharkiv)|Khersons'ka (Kherson)|Khmel'nyts'ka (Khmel'nyts'kyy)|Kirovohrads'ka (Kirovohrad)|Kyyiv|Kyyivs'ka (Kiev)|L'vivs'ka (L'viv)|Luhans'ka (Luhans'k)|Mykolayivs'ka (Mykolayiv)|Odes'ka (Odesa)|Poltavs'ka (Poltava)|Rivnens'ka (Rivne)|Sevastopol'|Sums'ka (Sumy)|Ternopil's'ka (Ternopil')|Vinnyts'ka (Vinnytsya)|Volyns'ka (Luts'k)|Zakarpats'ka (Uzhhorod)|Zaporiz'ka (Zaporizhzhya)|Zhytomyrs'ka (Zhytomyr)" -aStates[236]="|'Ajman|Abu Zaby (Abu Dhabi)|Al Fujayrah|Ash Shariqah (Sharjah)|Dubayy (Dubai)|Ra's al Khaymah|Umm al Qaywayn"; -aStates[237]="|Aberdeen|Aberdeenshire|Anglesey|Angus|Antrim|Argyl|Armagh|Avon|Ayrshire|Banffshire|Bedfordshire|Belfast|Berwickshire|Brecknockshire|Bristol|Buckinghamshire|Bute|Caernarfonshire|Cardiganshire|Caithness|Cambridgeshire|Carmarthenshire|Cheshire|Clackmannashire|Cleveland|Clwyd|Cornwall|Cromartyshire|Cumberland|Cumbria|Denbighshire|Derbyshire|Devon|Dfyed|Dorset|Down|Dumfriesshire|Dunbartonshire|Dundee|Durham|East Lothian|East Suffolk|Derry|East Sussex|Edinburgh|Essex|Fermanagh|Fife|Flintshire|Glasgow|Glamorgan|Gloucestershire|Greater London|Greater Manchester|Gwent|Gwynedd|Hampshire|Hereford and Worcester|Herefordshire|Inverness-shire|Hertfordshire|Humberside|Huntingdon and Peterborough|Huntingdonshire|Isle of Ely|Isle of Wight|Kent|Kincardineshire|Kincross-shire|Kirkcudbrightshire|Lanarkshire|Lancashire|Leicestershire|Lincolnshire|London|Londonderry|Merionethshire|Merseyside|Middlesex|Mid Glamorgan|Midlothian|Monmouthshire|Montgomeryshire|Moray|Nairnshire|Norfolk|Northamptonshire|Northumberland|North Humberside|North Yorkshire|Nottinghamshire|Orkney|Oxfordshire|Peeblesshire|Pembrokeshire|Perthshire|Powys|Radnorshire|Renfrewshire|Ross And Cromarty|Ross-shire|Roxburghshire|Selkirkshire|Shetland|Stirlingshire|Sutherland|Soke of Peterborough|Rutland|Shropshire|Somerset|South Glamorgan|South Humberside|South Yorkshire|Staffordshite|Suffolk|Surrey|Sussex|Tyne and Wear|Tyrone|Warwickshire|West Glamorgan|West Lothian|West Midlands|Westmorland|West Suffolk|West Sussex|West Yorkshire|Wigtownshire|Wiltshire|Worcestershire|Yorkshire"; -aStates[238]="|Artigas|Canelones|Cerro Largo|Colonia|Durazno|Flores|Florida|Lavalleja|Maldonado|Montevideo|Paysandu|Rio Negro|Rivera|Rocha|Salto|San Jose|Soriano|Tacuarembo|Treinta y Tres"; -aStates[239]="|Alabama|Alaska|Arizona|Arkansas|California|Colorado|Connecticut|Delaware|District of Columbia|Florida|Georgia|Hawaii|Idaho|Illinois|Indiana|Iowa|Kansas|Kentucky|Louisiana|Maine|Maryland|Massachusetts|Michigan|Minnesota|Mississippi|Missouri|Montana|Nebraska|Nevada|New Hampshire|New Jersey|New Mexico|New York|North Carolina|North Dakota|Ohio|Oklahoma|Oregon|Pennsylvania|Rhode Island|South Carolina|South Dakota|Tennessee|Texas|Utah|Vermont|Virginia|Washington|West Virginia|Wisconsin|Wyoming"; -aStates[240]="|Andijon Wiloyati|Bukhoro Wiloyati|Farghona Wiloyati|Jizzakh Wiloyati|Khorazm Wiloyati (Urganch)|Namangan Wiloyati|Nawoiy Wiloyati|Qashqadaryo Wiloyati (Qarshi)|Qoraqalpoghiston (Nukus)|Samarqand Wiloyati|Sirdaryo Wiloyati (Guliston)|Surkhondaryo Wiloyati (Termiz)|Toshkent Shahri|Toshkent Wiloyati"; -aStates[241]="|Malampa|Penama|Sanma|Shefa|Tafea|Torba"; -aStates[242]="|Amazonas|Anzoategui|Apure|Aragua|Barinas|Bolivar|Carabobo|Cojedes|Delta Amacuro|Dependencias Federales|Distrito Federal|Falcon|Guarico|Lara|Merida|Miranda|Monagas|Nueva Esparta|Portuguesa|Sucre|Tachira|Trujillo|Vargas|Yaracuy|Zulia"; -aStates[243]="|An Giang|Ba Ria-Vung Tau|Bac Giang|Bac Kan|Bac Lieu|Bac Ninh|Ben Tre|Binh Dinh|Binh Duong|Binh Phuoc|Binh Thuan|Ca Mau|Can Tho|Cao Bang|Da Nang|Dac Lak|Dong Nai|Dong Thap|Gia Lai|Ha Giang|Ha Nam|Ha Noi|Ha Tay|Ha Tinh|Hai Duong|Hai Phong|Ho Chi Minh|Hoa Binh|Hung Yen|Khanh Hoa|Kien Giang|Kon Tum|Lai Chau|Lam Dong|Lang Son|Lao Cai|Long An|Nam Dinh|Nghe An|Ninh Binh|Ninh Thuan|Phu Tho|Phu Yen|Quang Binh|Quang Nam|Quang Ngai|Quang Ninh|Quang Tri|Soc Trang|Son La|Tay Ninh|Thai Binh|Thai Nguyen|Thanh Hoa|Thua Thien-Hue|Tien Giang|Tra Vinh|Tuyen Quang|Vinh Long|Vinh Phuc|Yen Bai"; -aStates[244]="|Saint Croix|Saint John|Saint Thomas"; -aStates[245]="|Anglesey|Brecknockshire|Caernfonshire|Cardiganshire|Carmarthenshire|Clwyd|Denbighshire|Dyfed|Flintshire|Glamorgan|Gwent|Gwynedd|Merionethshire|Mid Glamorgan|Monmouthsire|Montgomeryshire|Pembrokeshire|Powys|Radnorshire|South Glamorgan|West Glamorgan"; -aStates[246]="|Alo|Sigave|Wallis"; -aStates[247]="|West Bank"; -aStates[248]="|Western Sahara"; -aStates[249]="|'Adan|'Ataq|Abyan|Al Bayda'|Al Hudaydah|Al Jawf|Al Mahrah|Al Mahwit|Dhamar|Hadhramawt|Hajjah|Ibb|Lahij|Ma'rib|Sa'dah|San'a'|Ta'izz"; -aStates[250]="|Kosovo|Montenegro|Serbia|Vojvodina"; -aStates[251]="|Central|Copperbelt|Eastern|Luapula|Lusaka|North-Western|Northern|Southern|Western"; -aStates[252]="|Bulawayo|Harare|ManicalandMashonaland Central|Mashonaland East|Mashonaland West|Masvingo|Matabeleland North|Matabeleland South|Midlands"; -aStates[253]="|Self Hosted|Private Server|Architects Of Sleep|Chaos Friends|DFRN|Distributed Friend Network|ErrLock|Free-Beer.ch|Foojbook|Free-Haven|Friendica.eu|Friendika.me.4.it|Friendika - I Ask Questions|Frndc.com|Hikado|Hipatia|Hungerfreunde|Kaluguran Community|Kak Ste|Karl.Markx.pm|Loozah Social Club|MyFriendica.net|MyFriendNetwork|Oi!|OpenMindSpace|Optimistisch|Pplsnet|Recolutionari.es|Repatr.de|SPRACI|Styliztique|Sysfu Social Club|theshi.re|Tumpambae|Uzmiac|Other"; +aStates[""] = ""; // Empty key +aStates["Afghanistan"] = "|Badakhshan|Badghis|Baghlan|Balkh|Bamyan|Daykundi|Farah|Faryab|Ghazni|Ghor|Helmand|Herat|Jowzjan|Kabul|Kandahar|Kapisa|Khost|Kunar|Kunduz|Laghman|Logar|Maidan Wardak|Nangarhar|Nimruz|Nuristan|Paktia|Paktika|Panjshir|Parwan|Samangan|Sar-e Pol|Takhar|Uruzgan|Zabul"; // 34 provinces — https://en.wikipedia.org/wiki/Provinces_of_Afghanistan +aStates["Åland Islands"] = "|Brändö|Eckerö|Finström|Föglö|Geta|Hammarland|Jomala|Kökar|Kumlinge|Lemland|Lumparland|Mariehamn|Saltvik|Sottunga|Sund|Vårdö"; // 16 municipalities — https://sv.wikipedia.org/wiki/%C3%85lands_kommuner https://en.wikipedia.org/wiki/Municipalities_of_%C3%85land +aStates["Albania"] = "|Berat|Dibër|Durrës|Elbasan|Fier|Gjirokastër|Korçë|Kukës|Lezhë|Shkodër|Tiranë|Vlorë"; // 12 counties — https://sq.wikipedia.org/wiki/Qarqet_e_Shqip%C3%ABris%C3%AB https://en.wikipedia.org/wiki/Counties_of_Albania +aStates["Algeria"] = "|Adrar|Aïn Defla|Aïn Témouchent|Algiers|Annaba|Batna|Béchar|Béjaïa|Beni Abbes|Biskra|Blida|Bordj Badji Mokhtar|Bordj Bou Arréridj|Bouira|Boumerdès|Chlef|Constantine|Djanet|Djelfa|El Bayadh|El Meghaier|El Meniaa|El Oued|El Tarf|Ghardaïa|Guelma|Illizi|In Guezzam|In Salah|Jijel|Khenchela|Laghouat|M'Sila|Mascara|Médéa|Mila|Mostaganem|Naâma|Oran|Ouargla|Ouled Djellal|Oum El Bouaghi|Relizane|Saïda|Sétif|Sidi Bel Abbès|Skikda|Souk Ahras|Tamanrasset|Tébessa|Tiaret|Tindouf|Tipaza|Tissemsilt|Tizi Ouzou|Tlemcen|Touggourt"; // 58 provinces — https://ar.wikipedia.org/wiki/%D9%88%D9%84%D8%A7%D9%8A%D8%A7%D8%AA_%D8%A7%D9%84%D8%AC%D8%B2%D8%A7%D8%A6%D8%B1 https://en.wikipedia.org/wiki/Provinces_of_Algeria +aStates["American Samoa"] = "|Eastern|Manu'a|Rose Atoll|Swains Island|Western"; // 5 divisions (3 districts + Swains Island + Rose Atoll) — https://en.wikipedia.org/wiki/Administrative_divisions_of_American_Samoa +aStates["Andorra"] = "|Andorra la Vella|Canillo|Encamp|Escaldes-Engordany|La Massana|Ordino|Sant Julià de Lòria"; // 7 parishes — https://ca.wikipedia.org/wiki/Parr%C3%B2quies_d%27Andorra https://en.wikipedia.org/wiki/Parishes_of_Andorra +aStates["Angola"] = "|Bengo|Benguela|Bié|Cabinda|Cuando Cubango|Cuanza Norte|Cuanza Sul|Cunene|Huambo|Huíla|Luanda|Lunda Norte|Lunda Sul|Malanje|Moxico|Namibe|Uíge|Zaire"; // 18 provinces — https://pt.wikipedia.org/wiki/Prov%C3%ADncias_de_Angola https://en.wikipedia.org/wiki/Provinces_of_Angola +aStates["Anguilla"] = "|Blowing Point|East End|George Hill|Island Harbour|North Hill|North Side|Sandy Ground|Sandy Hill|South Hill|Stoney Ground|The Farrington|The Quarter|The Valley|West End"; // 14 districts — https://en.wikipedia.org/wiki/Anguilla#Administrative_divisions https://www.gov.ai/ +aStates["Antarctica"] = "|Adélie Land|Argentine Antarctica|Australian Antarctic Territory|British Antarctic Territory|Chilean Antarctic Territory|Peter I Island|Queen Maud Land|Ross Dependency"; // 8 territorial claims (subject to the Antarctic Treaty) — https://en.wikipedia.org/wiki/Antarctica https://en.wikipedia.org/wiki/Territorial_claims_in_Antarctica +aStates["Antigua and Barbuda"] = "|Barbuda|Redonda|Saint George|Saint John|Saint Mary|Saint Paul|Saint Peter|Saint Philip"; // 8 (6 parishes + 2 dependencies) — https://en.wikipedia.org/wiki/Antigua_and_Barbuda#Administrative_divisions https://antigua-barbuda.org/government.htm +aStates["Argentina"] = "|Buenos Aires|Catamarca|Chaco|Chubut|Ciudad Autónoma de Buenos Aires|Córdoba|Corrientes|Entre Ríos|Formosa|Jujuy|La Pampa|La Rioja|Mendoza|Misiones|Neuquén|Río Negro|Salta|San Juan|San Luis|Santa Cruz|Santa Fe|Santiago del Estero|Tierra del Fuego, Antártida e Islas del Atlántico Sur|Tucumán"; // 24 (23 provinces + Autonomous City) — https://es.wikipedia.org/wiki/Provincias_de_Argentina https://en.wikipedia.org/wiki/Provinces_of_Argentina +aStates["Armenia"] = "|Aragatsotn|Ararat|Armavir|Gegharkunik|Kotayk|Lori|Shirak|Syunik|Tavush|Vayots Dzor|Yerevan"; // 11 (10 provinces + Yerevan) — https://hy.wikipedia.org/wiki/Հայաստանի_մարզեր https://en.wikipedia.org/wiki/Administrative_divisions_of_Armenia +aStates["Aruba"] = "|Noord|Oranjestad Oost|Oranjestad West|Paradera|San Nicolaas Noord|San Nicolaas Zuid|Santa Cruz|Savaneta"; // 8 regions (statistical/census regions) — https://nl.wikipedia.org/wiki/Aruba https://en.wikipedia.org/wiki/Aruba +aStates["Australia"] = "|Australian Capital Territory|New South Wales|Northern Territory|Queensland|South Australia|Tasmania|Victoria|Western Australia"; // 8 states and territories — https://en.wikipedia.org/wiki/States_and_territories_of_Australia +aStates["Austria"] = "|Burgenland|Kärnten|Niederösterreich|Oberösterreich|Salzburg|Steiermark|Tirol|Vorarlberg|Wien"; // 9 states — https://de.wikipedia.org/wiki/Bundesl%C3%A4nder_%C3%96sterreichs https://en.wikipedia.org/wiki/States_of_Austria +aStates["Azerbaijan"] = "|Absheron|Agdam|Agdash|Aghjabadi|Agstafa|Agsu|Astara|Babek|Baku|Balakan|Barda|Beylagan|Bilasuvar|Dashkasan|Fuzuli|Gadabay|Ganja|Gobustan|Goranboy|Goychay|Goygol|Hajigabul|Imishli|Ismayilli|Jabrayil|Jalilabad|Julfa|Kalbajar|Kangarli|Khachmaz|Khankendi|Khizi|Khojaly|Khojavend|Kurdamir|Lachin|Lankaran|Lankaran|Lerik|Masally|Mingachevir|Naftalan|Nakhchivan|Neftchala|Oghuz|Ordubad|Qabala|Qakh|Qazakh|Quba|Qubadli|Qusar|Saatly|Sabirabad|Sadarak|Salyan|Samukh|Shabran|Shahbuz|Shaki|Shaki|Shamakhi|Shamkir|Sharur|Shirvan|Shusha|Siyazan|Sumgait|Tartar|Tovuz|Ujar|Yardimli|Yevlakh|Yevlakh|Zagatala|Zangilan|Zardab"; // 77 administrative divisions (66 rayons + 11 cities) — https://az.wikipedia.org/wiki/Az%C9%99rbaycan%C4%B1n_iqtisadi_rayonlar%C4%B1 https://en.wikipedia.org/wiki/Administrative_divisions_of_Azerbaijan +aStates["Bahamas"] = "|Acklins|Berry Islands|Bimini|Cat Island|Central Abaco|Central Andros|Central Eleuthera|City of Freeport|Crooked Island|East Grand Bahama|Exuma|Exuma Cays|Grand Cay|Great Abaco Cays|Green Turtle Cay|Harbour Island|Inagua|Long Island|Mangrove Cay|Mayaguana|Moore's Island|North Abaco|North Andros|North Eleuthera|Ragged Island|Rum Cay|San Salvador|South Abaco|South Andros|South Eleuthera|Spanish Wells|Sweeting's Cay|West Grand Bahama"; // 32 districts — https://en.wikipedia.org/wiki/Administrative_divisions_of_the_Bahamas +aStates["Bahrain"] = "|Capital|Muharraq|Northern|Southern"; // 4 governorates — https://ar.wikipedia.org/wiki/%D9%85%D8%AD%D8%A7%D9%81%D8%B8%D8%A7%D8%AA_%D8%A7%D9%84%D8%A8%D8%AD%D8%B1%D9%8A%D9%86 https://en.wikipedia.org/wiki/Governorates_of_Bahrain +aStates["Bangladesh"] = "|Barishal|Chattogram|Dhaka|Khulna|Mymensingh|Rajshahi|Rangpur|Sylhet"; // 8 divisions — https://bn.wikipedia.org/wiki/%E0%A6%AC%E0%A6%BE%E0%A6%82%E0%A6%B2%E0%A6%BE%E0%A6%A6%E0%A7%87%E0%A6%B6%E0%A7%8D%E0%A6%8F%E0%A6%B0_%E0%A6%AC%E0%A6%BF%E0%A6%AD%E0%A6%BE%E0%A6%97%E0%A6%B8%E0%A6%AE%E0%A7%82%E0%A6%B9 https://en.wikipedia.org/wiki/Divisions_of_Bangladesh +aStates["Barbados"] = "|Christ Church|Saint Andrew|Saint George|Saint James|Saint John|Saint Joseph|Saint Lucy|Saint Michael|Saint Peter|Saint Philip|Saint Thomas"; // 11 parishes https://en.wikipedia.org/wiki/Parishes_of_Barbados +aStates["Belarus"] = "|Brest|Gomel|Grodno|Minsk City|Minsk Region|Mogilev|Vitebsk"; // 6 oblasts and 1 city https://en.wikipedia.org/wiki/Administrative_divisions_of_Belarus +aStates["Belgium"] = "|Antwerpen|Brabant Wallon|Brussels-Capital Region|Hainaut|Liège|Limburg|Luxembourg|Namur|Oost-Vlaanderen|Vlaams-Brabant|West-Vlaanderen"; // 10 provinces and 1 region https://en.wikipedia.org/wiki/Provinces_of_Belgium +aStates["Belize"] = "|Belize|Cayo|Corozal|Orange Walk|Stann Creek|Toledo"; // 6 districts https://en.wikipedia.org/wiki/Districts_of_Belize +aStates["Benin"] = "|Alibori|Atacora|Atlantique|Borgou|Collines|Couffo|Donga|Littoral|Mono|Ouémé|Plateau|Zou"; // 12 departments https://en.wikipedia.org/wiki/Departments_of_Benin +aStates["Bermuda"] = "|Devonshire|Hamilton|Paget|Pembroke|Sandys|Smith's|Southampton|St George's|Warwick"; // 9 parishes https://en.wikipedia.org/wiki/Parishes_of_Bermuda +aStates["Bhutan"] = "|Bumthang|Chukha|Dagana|Gasa|Haa|Lhuntse|Mongar|Paro|Pemagatshel|Punakha|Samdrup Jongkhar|Samtse|Sarpang|Thimphu|Trashigang|Trashiyangtse|Trongsa|Tsirang|Wangdue Phodrang|Zhemgang"; // 20 dzongkhags https://en.wikipedia.org/wiki/Dzongkhags_of_Bhutan +aStates["Bolivia"] = "|Beni|Chuquisaca|Cochabamba|La Paz|Oruro|Pando|Potosí|Santa Cruz|Tarija"; // 9 departments https://en.wikipedia.org/wiki/Departments_of_Bolivia +aStates["Bonaire, Sint Eustatius and Saba"] = "|Bonaire|Saba|Sint Eustatius"; // 3 Caribbean Netherlands special municipalities https://en.wikipedia.org/wiki/Caribbean_Netherlands +aStates["Bosnia and Herzegovina"] = "|Brčko Distrikt|Federacija Bosne i Hercegovine|Republika Srpska"; // 2 entities and 1 district https://en.wikipedia.org/wiki/Political_divisions_of_Bosnia_and_Herzegovina +aStates["Botswana"] = "|Central|Chobe|Francistown|Gaborone|Ghanzi|Jwaneng|Kgalagadi|Kgatleng|Kweneng|Lobatse|North-East|North-West|Orapa|Selebi-Phikwe|South-East|Southern|Sowa"; // 17 districts https://en.wikipedia.org/wiki/Districts_of_Botswana +aStates["Bouvet Island"] = "|Bouvet Island"; // 1 island https://en.wikipedia.org/wiki/Bouvet_Island +aStates["Brazil"] = "|Acre|Alagoas|Amapá|Amazonas|Bahia|Ceará|Distrito Federal|Espírito Santo|Goiás|Maranhão|Mato Grosso|Mato Grosso do Sul|Minas Gerais|Pará|Paraíba|Paraná|Pernambuco|Piauí|Rio de Janeiro|Rio Grande do Norte|Rio Grande do Sul|Rondônia|Roraima|Santa Catarina|São Paulo|Sergipe|Tocantins"; // 26 states and 1 federal district https://en.wikipedia.org/wiki/States_of_Brazil +aStates["British Indian Ocean Territory"] = "|Diego Garcia|Egmont Islands|Nelson Island|Peros Banhos|Salomon Islands|Three Brothers"; // 6 island groups https://en.wikipedia.org/wiki/British_Indian_Ocean_Territory +aStates["Brunei Darussalam"] = "|Belait|Brunei-Muara|Temburong|Tutong"; // 4 districts https://en.wikipedia.org/wiki/Districts_of_Brunei +aStates["Bulgaria"] = "|Blagoevgrad|Burgas|Dobrich|Gabrovo|Haskovo|Kardzhali|Kyustendil|Lovech|Montana|Pazardzhik|Pernik|Pleven|Plovdiv|Razgrad|Ruse|Shumen|Silistra|Sliven|Smolyan|Sofia|Sofia-grad|Stara Zagora|Targovishte|Varna|Veliko Tarnovo|Vidin|Vratsa|Yambol"; // 28 provinces https://en.wikipedia.org/wiki/Provinces_of_Bulgaria +aStates["Burkina Faso"] = "|Bale|Bam|Banwa|Bazega|Bougouriba|Boulgou|Boulkiemde|Comoe|Ganzourgou|Gnagna|Gourma|Houet|Ioba|Kadiogo|Kenedougou|Komondjari|Kompienga|Kossi|Koulpelogo|Kouritenga|Kourweogo|Leraba|Loroum|Mouhoun|Nahouri|Namentenga|Nayala|Noumbiel|Oubritenga|Oudalan|Passore|Poni|Sanguie|Sanmatenga|Seno|Sissili|Soum|Sourou|Tapoa|Tuy|Yagha|Yatenga|Ziro|Zondoma|Zoundweogo"; // 45 provinces https://en.wikipedia.org/wiki/Provinces_of_Burkina_Faso +aStates["Burundi"] = "|Buhumuza|Bujumbura|Burunga|Butanyerera|Gitega"; // 5 provinces based on the 2025 territorial reform https://en.wikipedia.org/wiki/Provinces_of_Burundi +aStates["Cabo Verde"] = "|Boa Vista|Brava|Maio|Mosteiros|Paul|Porto Novo|Praia|Ribeira Grande|Sal|Santa Catarina|Santa Cruz|Sao Domingos|Sao Filipe|Sao Nicolau|Sao Vicente|Tarrafal"; // 22 municipalities https://en.wikipedia.org/wiki/Municipalities_of_Cape_Verde +aStates["Cambodia"] = "|Banteay Mean Cheay|Batdambang|Kampong Cham|Kampong Chhnang|Kampong Spoe|Kampong Thum|Kampot|Kandal|Kaoh Kong|Keb|Kracheh|Mondol Kiri|Otdar Mean Cheay|Pailin|Phnum Penh|Pouthisat|Preah Seihanu (Sihanoukville)|Preah Vihear|Prey Veng|Rotanah Kiri|Siem Reab|Stoeng Treng|Svay Rieng|Takev"; // 25 provinces https://en.wikipedia.org/wiki/Provinces_of_Cambodia +aStates["Cameroon"] = "|Adamaoua|Centre|Est|Extrême-Nord|Littoral|Nord|Nord-Ouest|Ouest|Sud|Sud-Ouest"; // 10 regions (https://fr.wikipedia.org/wiki/R%C3%A9gions_du_Cameroun) +aStates["Canada"] = "|Alberta|British Columbia|Manitoba|New Brunswick|Newfoundland and Labrador|Northwest Territories|Nova Scotia|Nunavut|Ontario|Prince Edward Island|Quebec|Saskatchewan|Yukon"; // 10 provinces + 3 territories (https://en.wikipedia.org/wiki/Provinces_and_territories_of_Canada) +aStates["Cayman Islands"] = "|Bodden Town|Cayman Brac|East End|George Town|Little Cayman|North Side|West Bay"; // 6 districts (https://en.wikipedia.org/wiki/Geography_of_the_Cayman_Islands) +aStates["Central African Republic"] = "|Bamingui-Bangoran|Bangui|Basse-Kotto|Haut-Mbomou|Haute-Kotto|Kémo|Lim-Pendé|Lobaye|Mambéré|Mambéré-Kadéï|Mbomou|Nana-Grébizi|Nana-Mambéré|Ombella-M'Poko|Ouaka|Ouham|Ouham-Fafa|Ouham-Pendé|Sangha-Mbaéré|Vakaga"; // 20 prefectures (reform 2021) (https://fr.wikipedia.org/wiki/Pr%C3%A9fectures_de_la_R%C3%A9publique_centrafricaine) +aStates["Chad"] = "|Bahr el-Gazel|Batha|Borkou|Chari-Baguirmi|Ennedi-Est|Ennedi-Ouest|Guéra|Hadjer-Lamis|Kanem|Lac|Logone Occidental|Logone Oriental|Mandoul|Mayo-Kebbi Est|Mayo-Kebbi Ouest|Moyen-Chari|N'Djamena|Ouaddaï|Salamat|Sila|Tandjilé|Tibesti|Wadi Fira"; // 23 provinces (restructured 2018) (https://en.wikipedia.org/wiki/Provinces_of_Chad) +aStates["Chile"] = "|Antofagasta|Araucanía|Arica y Parinacota|Atacama|Aysén|Biobío|Coquimbo|Los Lagos|Los Ríos|Magallanes y de la Antártica Chilena|Maule|Metropolitana de Santiago|Ñuble|O'Higgins|Tarapacá|Valparaíso"; // 16 regions (restructured 2018) (https://es.wikipedia.org/wiki/Regiones_de_Chile) +aStates["China"] = "|Anhui|Beijing|Chongqing|Fujian|Gansu|Guangdong|Guangxi|Guizhou|Hainan|Hebei|Heilongjiang|Henan|Hubei|Hunan|Jiangsu|Jiangxi|Jilin|Liaoning|Nei Mongol|Ningxia|Qinghai|Shaanxi|Shandong|Shanghai|Shanxi|Sichuan|Tianjin|Xinjiang|Xizang (Tibet)|Yunnan|Zhejiang"; // 31 provinces/autonomous regions/municipalities (https://en.wikipedia.org/wiki/Administrative_divisions_of_China) +aStates["Christmas Island"] = "|Drumsite|Flying Fish Cove|Kampong|Lily Beach|Poon Saan|Settlement|Silver City"; // 7 settlements (https://en.wikipedia.org/wiki/Christmas_Island) +aStates["Cocos (Keeling) Islands"] = "|Direction Island|Home Island|Horsburgh Island|North Keeling Island|South Island|West Island"; // 6 islands (https://en.wikipedia.org/wiki/Cocos_(Keeling)_Islands) +aStates["Colombia"] = "|Amazonas|Antioquia|Arauca|Atlantico|Bolivar|Boyaca|Caldas|Caqueta|Casanare|Cauca|Cesar|Choco|Cordoba|Cundinamarca|Distrito Capital de Santa Fe de Bogota|Guainia|Guaviare|Huila|La Guajira|Magdalena|Meta|Narino|Norte de Santander|Putumayo|Quindio|Risaralda|San Andres y Providencia|Santander|Sucre|Tolima|Valle del Cauca|Vaupes|Vichada"; // 32 departments + capital district (https://es.wikipedia.org/wiki/Departamentos_de_Colombia) +aStates["Comoros"] = "|Anjouan (Nzwani)|Grande Comore (Njazidja)|Moheli (Mwali)"; // 3 autonomous islands (https://fr.wikipedia.org/wiki/%C3%8Eles_autonomes_des_Comores) +aStates["Congo"] = "|Bouenza|Brazzaville|Congo-Oubangui|Cuvette|Cuvette-Ouest|Djoué-Léfini|Kouilou|Lékoumou|Likouala|Niari|Nkéni-Alima|Plateaux|Pointe-Noire|Pool|Sangha"; // 15 departments (updated October 2024) (https://fr.wikipedia.org/wiki/D%C3%A9partements_du_Congo) +aStates["Democratic Republic of the Congo"] = "|Bas-Uele|Équateur|Haut-Katanga|Haut-Lomami|Haut-Uele|Ituri|Kasaï|Kasaï-Central|Kasaï-Oriental|Kinshasa|Kongo Central|Kwango|Kwilu|Lomami|Lualaba|Mai-Ndombe|Maniema|Mongala|Nord-Kivu|Nord-Ubangi|Sankuru|Sud-Kivu|Sud-Ubangi|Tanganyika|Tshopo|Tshuapa"; // 26 provinces (restructured 2015) (https://fr.wikipedia.org/wiki/Provinces_de_la_R%C3%A9publique_d%C3%A9mocratique_du_Congo) +aStates["Cook Islands"] = "|Aitutaki|Atiu|Mangaia|Manihiki|Manuae|Mauke|Mitiaro|Nassau|Palmerston|Penrhyn|Pukapuka|Rakahanga|Rarotonga|Suwarrow|Takutea"; // 15 islands (https://en.wikipedia.org/wiki/Cook_Islands) +aStates["Costa Rica"] = "|Alajuela|Cartago|Guanacaste|Heredia|Limon|Puntarenas|San Jose"; // 7 provinces (https://es.wikipedia.org/wiki/Provincias_de_Costa_Rica) +aStates["Côte d'Ivoire"] = "|Abengourou|Abidjan|Aboisso|Adiake'|Adzope|Agboville|Agnibilekrou|Ale'pe'|Bangolo|Beoumi|Biankouma|Bocanda|Bondoukou|Bongouanou|Bouafle|Bouake|Bouna|Boundiali|Dabakala|Dabon|Daloa|Danane|Daoukro|Dimbokro|Divo|Duekoue|Ferkessedougou|Gagnoa|Grand Bassam|Grand-Lahou|Guiglo|Issia|Jacqueville|Katiola|Korhogo|Lakota|Man|Mankono|Mbahiakro|Odienne|Oume|Sakassou|Sassandra|Seguela|Sinfra|Soubre|Tabou|Tanda|Tiassale|Tiebissou|Tingrela|Touba|Toulepleu|Toumodi|Vavoua|Yamoussoukro|Zuenoula"; // 60 departments (https://fr.wikipedia.org/wiki/Districts_de_C%C3%B4te_d%27Ivoire) +aStates["Croatia"] = "|Bjelovarsko-bilogorska županija|Brodsko-posavska županija|Dubrovačko-neretvanska županija|Istarska županija|Karlovačka županija|Koprivničko-križevačka županija|Krapinsko-zagorska županija|Ličko-senjska županija|Međimurska županija|Osječko-baranjska županija|Požeško-slavonska županija|Primorsko-goranska županija|Šibensko-kninska županija|Sisačko-moslavačka županija|Splitsko-dalmatinska županija|Varaždinska županija|Virovitičko-podravska županija|Vukovarsko-srijemska županija|Zadarska županija|Zagreb|Zagrebačka županija"; // 20 counties + Zagreb city (https://en.wikipedia.org/wiki/Counties_of_Croatia) +aStates["Cuba"] = "|Artemisa|Camaguey|Ciego de Avila|Cienfuegos|Granma|Guantanamo|Holguin|Isla de la Juventud|La Habana|Las Tunas|Matanzas|Mayabeque|Pinar del Rio|Sancti Spiritus|Santiago de Cuba|Villa Clara"; // 15 provinces + 1 special municipality (https://es.wikipedia.org/wiki/Divisi%C3%B3n_territorial_de_Cuba) +aStates["Curaçao"] = "|Bandabou|Bandariba|Willemstad"; // 1 city district + 2 outer districts (https://en.wikipedia.org/wiki/Cura%C3%A7ao) +aStates["Cyprus"] = "|Famagusta|Kyrenia|Larnaca|Limassol|Nicosia|Paphos"; // 6 districts (https://en.wikipedia.org/wiki/Districts_of_Cyprus) +aStates["Czechia"] = "|Hlavní město Praha|Jihočeský kraj|Jihomoravský kraj|Karlovarský kraj|Kraj Vysočina|Královéhradecký kraj|Liberecký kraj|Moravskoslezský kraj|Olomoucký kraj|Pardubický kraj|Plzeňský kraj|Středočeský kraj|Ústecký kraj|Zlínský kraj"; // 1 capital city + 13 regions (https://en.wikipedia.org/wiki/Regions_of_the_Czech_Republic) +aStates["Denmark"] = "|Hovedstaden|Midtjylland|Nordjylland|Sjælland|Syddanmark"; // 5 regions (https://en.wikipedia.org/wiki/Regions_of_Denmark) +aStates["Djibouti"] = "|Ali Sabieh|Arta|Dikhil|Djibouti|Obock|Tadjourah"; // 6 regions (https://en.wikipedia.org/wiki/Regions_of_Djibouti) +aStates["Dominica"] = "|Saint Andrew|Saint David|Saint George|Saint John|Saint Joseph|Saint Luke|Saint Mark|Saint Patrick|Saint Paul|Saint Peter"; // 10 parishes (https://en.wikipedia.org/wiki/Parishes_of_Dominica) +aStates["Dominican Republic"] = "|Azua|Baoruco|Barahona|Dajabón|Distrito Nacional|Duarte|El Seibo|Elías Piña|Espaillat|Hato Mayor|Hermanas Mirabal|Independencia|La Altagracia|La Romana|La Vega|María Trinidad Sánchez|Monseñor Nouel|Monte Cristi|Monte Plata|Pedernales|Peravia|Puerto Plata|Samaná|San Cristóbal|San José de Ocoa|San Juan|San Pedro de Macorís|Sánchez Ramírez|Santiago|Santiago Rodríguez|Santo Domingo|Valverde"; // 31 provinces + 1 national district (https://en.wikipedia.org/wiki/Provinces_of_the_Dominican_Republic) +aStates["Ecuador"] = "|Azuay|Bolívar|Cañar|Carchi|Chimborazo|Cotopaxi|El Oro|Esmeraldas|Galápagos|Guayas|Imbabura|Loja|Los Ríos|Manabí|Morona Santiago|Napo|Orellana|Pastaza|Pichincha|Santa Elena|Santo Domingo de los Tsáchilas|Sucumbíos|Tungurahua|Zamora Chinchipe"; // 24 provinces (https://en.wikipedia.org/wiki/Provinces_of_Ecuador) +aStates["Egypt"] = "|Alexandria|Aswan|Asyut|Beheira|Beni Suef|Cairo|Dakahlia|Damietta|Faiyum|Gharbia|Giza|Ismailia|Kafr El Sheikh|Luxor|Matrouh|Minya|Monufia|New Valley|North Sinai|Port Said|Qalyubia|Qena|Red Sea|Sharqia|Sohag|South Sinai|Suez"; // 27 governorates (https://en.wikipedia.org/wiki/Governorates_of_Egypt) +aStates["El Salvador"] = "|Ahuachapán|Cabañas|Chalatenango|Cuscatlán|La Libertad|La Paz|La Unión|Morazán|San Miguel|San Salvador|San Vicente|Santa Ana|Sonsonate|Usulután"; // 14 departments (https://en.wikipedia.org/wiki/Departments_of_El_Salvador) +aStates["Equatorial Guinea"] = "|Annobón|Bioko Norte|Bioko Sur|Centro Sur|Djibloho|Kié-Ntem|Litoral|Wele-Nzas"; // 8 provinces (https://en.wikipedia.org/wiki/Provinces_of_Equatorial_Guinea) +aStates["Eritrea"] = "|Anseba Region|Central Region|Debub Region|Gash-Barka Region|Northern Red Sea Region|Southern Red Sea Region"; // 6 regions (https://en.wikipedia.org/wiki/Regions_of_Eritrea) +aStates["Estonia"] = "|Harju County|Hiiu County|Ida-Viru County|Järva County|Jõgeva County|Lääne County|Lääne-Viru County|Pärnu County|Põlva County|Rapla County|Saare County|Tartu County|Valga County|Viljandi County|Võru County"; // 15 counties (https://en.wikipedia.org/wiki/Counties_of_Estonia) +aStates["Eswatini"] = "|Hhohho|Lubombo|Manzini|Shiselweni"; // 4 regions (https://en.wikipedia.org/wiki/Regions_of_Eswatini) +aStates["Ethiopia"] = "|Addis Ababa|Afar Region|Amhara Region|Benishangul-Gumuz Region|Central Ethiopia Regional State|Dire Dawa|Gambela Region|Harari Region|Oromia Region|Sidama Region|Somali Region|South Ethiopia Regional State|South West Ethiopia Peoples' Region|Tigray Region"; // 12 regions and 2 chartered cities based on the 2023 administrative reform (https://en.wikipedia.org/wiki/Regions_of_Ethiopia) +aStates["Falkland Islands (Islas Malvinas)"] = "|East Falkland|Stanley|West Falkland"; // 2 main islands and capital (https://en.wikipedia.org/wiki/Falkland_Islands) +aStates["Faroe Islands"] = "|Eysturoy|Norðoyar|Sandoy|Streymoy|Suðuroy|Vágar"; // 6 traditional regions (https://en.wikipedia.org/wiki/Regions_of_the_Faroe_Islands) +aStates["Fiji"] = "|Central|Eastern|Northern|Rotuma|Western"; // 5 divisions (https://en.wikipedia.org/wiki/Divisions_of_Fiji) +aStates["Finland"] = "|Åland|Etelä-Karjala|Etelä-Pohjanmaa|Etelä-Savo|Kainuu|Kanta-Häme|Keski-Pohjanmaa|Keski-Suomi|Kymenlaakso|Lappi|Päijät-Häme|Pirkanmaa|Pohjanmaa|Pohjois-Karjala|Pohjois-Pohjanmaa|Pohjois-Savo|Satakunta|Uusimaa|Varsinais-Suomi"; // 19 regions (https://en.wikipedia.org/wiki/Regions_of_Finland) +aStates["France"] = "|Auvergne-Rhône-Alpes|Bourgogne-Franche-Comté|Bretagne|Centre-Val de Loire|Corse|Grand Est|Guadeloupe|Guyane|Hauts-de-France|Île-de-France|Martinique|Mayotte|Normandie|Nouvelle-Aquitaine|Occitanie|Pays de la Loire|Provence-Alpes-Côte d'Azur|Réunion"; // 18 regions (https://en.wikipedia.org/wiki/Regions_of_France) +aStates["French Guiana"] = "|Apatou|Awala-Yalimapo|Camopi|Cayenne|Grand-Santi|Iracoubo|Kourou|Macouria|Mana|Maripasoula|Matoury|Montsinery-Tonnegrande|Ouanary|Papaichton|Régina|Remire-Montjoly|Roura|Saint-Élie|Saint-Georges|Saint-Laurent-du-Maroni|Saül|Sinnamary"; // 22 communes (https://en.wikipedia.org/wiki/Communes_of_French_Guiana) +aStates["French Polynesia"] = "|Îles Australes|Îles du Vent|Îles Marquises|Îles Sous-le-Vent|Îles Tuamotu-Gambier"; // 5 administrative subdivisions (https://en.wikipedia.org/wiki/Administrative_divisions_of_French_Polynesia) +aStates["French Southern Territories"] = "|Îles Crozet|Îles Éparses|Îles Kerguelen|Îles Saint-Paul-et-Amsterdam|Terre Adélie"; // 5 districts (https://en.wikipedia.org/wiki/French_Southern_and_Antarctic_Lands) +aStates["Gabon"] = "|Estuaire|Haut-Ogooué|Moyen-Ogooué|Ngounié|Nyanga|Ogooué-Ivindo|Ogooué-Lolo|Ogooué-Maritime|Woleu-Ntem"; // 9 provinces (https://en.wikipedia.org/wiki/Provinces_of_Gabon) +aStates["Gambia"] = "|Banjul|Basse|Brikama|Janjanbureh|Kanifing|Kerewan|Kuntaur|Mansakonko"; // 8 local government areas (https://en.wikipedia.org/wiki/Local_government_areas_of_The_Gambia) +aStates["Georgia"] = "|Abkhazia|Adjara|Guria|Imereti|Kakheti|Kvemo Kartli|Mtskheta-Mtianeti|Racha-Lechkhumi and Kvemo Svaneti|Samegrelo-Zemo Svaneti|Samtskhe-Javakheti|Shida Kartli|Tbilisi"; // 2 autonomous republics + 9 regions + capital (https://en.wikipedia.org/wiki/Administrative_divisions_of_Georgia_(country)) +aStates["Germany"] = "|Baden-Württemberg|Bayern|Berlin|Brandenburg|Bremen|Hamburg|Hessen|Mecklenburg-Vorpommern|Niedersachsen|Nordrhein-Westfalen|Rheinland-Pfalz|Saarland|Sachsen|Sachsen-Anhalt|Schleswig-Holstein|Thüringen"; // 16 federal states (https://en.wikipedia.org/wiki/States_of_Germany) +aStates["Ghana"] = "|Ahafo|Ashanti|Bono|Bono East|Central|Eastern|Greater Accra|North East|Northern|Oti|Savannah|Upper East|Upper West|Volta|Western|Western North"; // 16 regions (https://en.wikipedia.org/wiki/Regions_of_Ghana) +aStates["Gibraltar"] = "|Gibraltar"; // No administrative divisions (British Overseas Territory) (https://en.wikipedia.org/wiki/Gibraltar) +aStates["Greece"] = "|Attica|Central Greece|Central Macedonia|Crete|Eastern Macedonia and Thrace|Epirus|Ionian Islands|Mount Athos|North Aegean|Peloponnese|South Aegean|Thessaly|Western Greece|Western Macedonia"; // 13 regions + 1 autonomous region (https://en.wikipedia.org/wiki/Regions_of_Greece) +aStates["Greenland"] = "|Avannaata|Kujalleq|Qeqertalik|Qeqqata|Sermersooq"; // 5 municipalities (https://en.wikipedia.org/wiki/Municipalities_of_Greenland) +aStates["Grenada"] = "|Carriacou and Petite Martinique|Saint Andrew|Saint David|Saint George|Saint John|Saint Mark|Saint Patrick"; // 6 parishes + 1 dependency (https://en.wikipedia.org/wiki/Parishes_of_Grenada) +aStates["Guam"] = "|Agana Heights|Agat|Asan-Maina|Barrigada|Chalan Pago-Ordot|Dededo|Hagatna|Inarajan|Mangilao|Merizo|Mongmong-Toto-Maite|Piti|Santa Rita|Sinajana|Talofofo|Tamuning-Tumon-Harmon|Umatac|Yigo|Yona"; // 19 villages (https://en.wikipedia.org/wiki/Villages_of_Guam) +aStates["Guadeloupe"] = "|Anse-Bertrand|Baie-Mahault|Baillif|Basse-Terre|Bouillante|Capesterre-Belle-Eau|Capesterre-de-Marie-Galante|Deshaies|Gourbeyre|Goyave|Grand-Bourg|La Désirade|Lamentin|Le Gosier|Le Moule|Les Abymes|Morne-à-l'Eau|Petit-Bourg|Petit-Canal|Pointe-à-Pitre|Pointe-Noire|Port-Louis|Saint-Claude|Saint-François|Saint-Louis|Sainte-Anne|Sainte-Rose|Terre-de-Bas|Terre-de-Haut|Trois-Rivières|Vieux-Fort|Vieux-Habitants"; // 32 communes (https://en.wikipedia.org/wiki/Communes_of_Guadeloupe) +aStates["Guatemala"] = "|Alta Verapaz|Baja Verapaz|Chimaltenango|Chiquimula|El Progreso|Escuintla|Guatemala|Huehuetenango|Izabal|Jalapa|Jutiapa|Petén|Quetzaltenango|Quiché|Retalhuleu|Sacatepéquez|San Marcos|Santa Rosa|Sololá|Suchitepéquez|Totonicapán|Zacapa"; // 22 departments (https://en.wikipedia.org/wiki/Departments_of_Guatemala) +aStates["Guernsey"] = "|Castel|Forest|Saint Andrew|Saint Martin|Saint Peter Port|Saint Pierre du Bois|Saint Sampson|Saint Saviour|Torteval|Vale"; // 10 parishes (https://en.wikipedia.org/wiki/Parishes_of_Guernsey) +aStates["Guinea"] = "|Boké|Conakry|Faranah|Kankan|Kindia|Labé|Mamou|Nzérékoré"; // 8 regions including special zone (https://en.wikipedia.org/wiki/Regions_of_Guinea) +aStates["Guinea-Bissau"] = "|Bafatá|Biombo|Bissau|Bolama|Cacheu|Gabú|Oio|Quinara|Tombali"; // 8 regions + 1 autonomous sector (https://en.wikipedia.org/wiki/Regions_of_Guinea-Bissau) +aStates["Guyana"] = "|Barima-Waini|Cuyuni-Mazaruni|Demerara-Mahaica|East Berbice-Corentyne|Essequibo Islands-West Demerara|Mahaica-Berbice|Pomeroon-Supenaam|Potaro-Siparuni|Upper Demerara-Berbice|Upper Takutu-Upper Essequibo"; // 10 regions (https://en.wikipedia.org/wiki/Regions_of_Guyana) +aStates["Haiti"] = "|Artibonite|Centre|Grand'Anse|Nippes|Nord|Nord-Est|Nord-Ouest|Ouest|Sud|Sud-Est"; // 10 departments (https://en.wikipedia.org/wiki/Departments_of_Haiti) +aStates["Heard Island and McDonald Islands"] = "|Heard Island|McDonald Islands"; // 2 islands (https://en.wikipedia.org/wiki/Heard_Island_and_McDonald_Islands) +aStates["Holy See"] = "|Vatican City"; // 1 city-state (https://en.wikipedia.org/wiki/Vatican_City) +aStates["Honduras"] = "|Atlántida|Choluteca|Colón|Comayagua|Copán|Cortés|El Paraíso|Francisco Morazán|Gracias a Dios|Intibucá|Islas de la Bahía|La Paz|Lempira|Ocotepeque|Olancho|Santa Bárbara|Valle|Yoro"; // 18 departments (https://en.wikipedia.org/wiki/Departments_of_Honduras) +aStates["Hong Kong"] = "|Central and Western|Eastern|Islands|Kowloon City|Kwai Tsing|Kwun Tong|North|Sai Kung|Sha Tin|Sham Shui Po|Southern|Tai Po|Tsuen Wan|Tuen Mun|Wan Chai|Wong Tai Sin|Yau Tsim Mong|Yuen Long"; // 18 administrative districts (https://en.wikipedia.org/wiki/Districts_of_Hong_Kong) +aStates["Hungary"] = "|Bács-Kiskun|Baranya|Békés|Borsod-Abaúj-Zemplén|Budapest|Csongrád-Csanád|Fejér|Győr-Moson-Sopron|Hajdú-Bihar|Heves|Jász-Nagykun-Szolnok|Komárom-Esztergom|Nógrád|Pest|Somogy|Szabolcs-Szatmár-Bereg|Tolna|Vas|Veszprém|Zala"; // 19 counties and 1 capital city (https://en.wikipedia.org/wiki/Counties_of_Hungary) +aStates["Iceland"] = "|Akranes|Akureyri|Árborg|Árneshreppur|Ásahreppur|Bláskógabyggð|Bolungarvík|Borgarbyggð|Dalabyggð|Dalvíkurbyggð|Eyja- og Miklaholtshreppur|Eyjafjarðarsveit|Fjallabyggð|Fjarðabyggð|Fljótsdalshreppur|Flóahreppur|Garðabær|Grímsnes- og Grafningshreppur|Grindavík|Grýtubakkahreppur|Hafnarfjörður|Hörgársveit|Hornafjörður|Hrunamannahreppur|Húnabyggð|Húnaþing vestra|Hvalfjarðarsveit|Hveragerði|Ísafjarðarbær|Kaldrananeshreppur|Kjósarhreppur|Kópavogur|Langanesbyggð|Mosfellsbær|Múlaþing|Mýrdalshreppur|Norðurþing|Ölfus|Rangárþing eystra|Rangárþing ytra|Reykhólahreppur|Reykjanesbær|Reykjavík|Seltjarnarnes|Skaftárhreppur|Skagafjörður|Skagaströnd|Skeiða- og Gnúpverjahreppur|Snæfellsbær|Strandabyggð|Stykkishólmur|Súðavík|Suðurnesjabær|Svalbarðsstrandarhreppur|Tjörneshreppur|Vestmannaeyjar|Vesturbyggð|Vogar|Vopnafjarðarhreppur|Þingeyjarsveit"; // 62 municipalities (https://en.wikipedia.org/wiki/List_of_municipalities_of_Iceland) +aStates["India"] = "|Andaman and Nicobar Islands|Andhra Pradesh|Arunachal Pradesh|Assam|Bihar|Chandigarh|Chhattisgarh|Dadra and Nagar Haveli and Daman and Diu|Delhi|Goa|Gujarat|Haryana|Himachal Pradesh|Jammu and Kashmir|Jharkhand|Karnataka|Kerala|Ladakh|Lakshadweep|Madhya Pradesh|Maharashtra|Manipur|Meghalaya|Mizoram|Nagaland|Odisha|Puducherry|Punjab|Rajasthan|Sikkim|Tamil Nadu|Telangana|Tripura|Uttar Pradesh|Uttarakhand|West Bengal"; // 28 states and 8 union territories (https://en.wikipedia.org/wiki/States_and_union_territories_of_India) +aStates["Indonesia"] = "|Aceh|Bali|Bangka Belitung Islands|Banten|Bengkulu|Central Java|Central Kalimantan|Central Papua|Central Sulawesi|East Java|East Kalimantan|East Nusa Tenggara|Gorontalo|Highland Papua|Jakarta|Jambi|Lampung|Maluku|North Kalimantan|North Maluku|North Sulawesi|North Sumatra|Papua|Riau|Riau Islands|South Kalimantan|South Papua|South Sulawesi|South Sumatra|Southeast Sulawesi|Southwest Papua|West Java|West Kalimantan|West Nusa Tenggara|West Papua|West Sulawesi|West Sumatra|Yogyakarta"; // 38 provinces (https://en.wikipedia.org/wiki/Provinces_of_Indonesia) +aStates["Iran"] = "|Alborz|Ardabil|Azarbayjan-e Gharbi|Azarbayjan-e Sharqi|Bushehr|Chahar Mahall va Bakhtiari|Esfahan|Fars|Gilan|Golestan|Hamadan|Hormozgan|Ilam|Kerman|Kermanshah|Khorasan-e Jonubi|Khorasan-e Razavi|Khorasan-e Shomali|Khuzestan|Kohgiluyeh va Buyer Ahmad|Kordestan|Lorestan|Markazi|Mazandaran|Qazvin|Qom|Semnan|Sistan va Baluchestan|Tehran|Yazd|Zanjan"; // 31 provinces (https://en.wikipedia.org/wiki/Provinces_of_Iran) +aStates["Iraq"] = "|Al Anbar|Al Basrah|Al Muthanna|Al Qadisiyah|An Najaf|Arbil|As Sulaymaniyah|At Ta'mim|Babil|Baghdad|Dahuk|Dhi Qar|Diyala|Karbala'|Maysan|Ninawa|Salah ad Din|Wasit"; // 18 governorates (https://en.wikipedia.org/wiki/Governorates_of_Iraq) +aStates["Ireland"] = "|Antrim|Armargh|Carlow|Cavan|Clare|Cork|Derry|Donegal|Down|Dublin|Dún Laoghaire–Rathdown|Fermanagh|Fingal|Galway|Kerry|Kildare|Kilkenny|Laois|Leitrim|Limerick|Longford|Louth|Mayo|Meath|Monaghan|Offaly|Roscommon|Sligo|Tipperary|Tyrone|Waterford|Westmeath|Wexford|Wicklow"; // 32 counties (https://en.wikipedia.org/wiki/Counties_of_Ireland) +aStates["Isle of Man"] = "|Andreas|Arbory|Ballaugh|Braddan|Bride|Castletown|Douglas|German|Jurby|Laxey|Lezayre|Lonan|Malew|Marown|Maughold|Michael|Onchan|Patrick|Peel|Port Erin|Port St Mary|Ramsey|Rushen|Santon"; // 17 parishes (https://en.wikipedia.org/wiki/Parishes_of_the_Isle_of_Man) +aStates["Israel"] = "|Central|Haifa|Jerusalem|Northern|Southern|Tel Aviv"; // 6 districts (https://en.wikipedia.org/wiki/Districts_of_Israel) +aStates["Italy"] = "|Abruzzo|Basilicata|Calabria|Campania|Emilia-Romagna|Friuli-Venezia Giulia|Lazio|Liguria|Lombardia|Marche|Molise|Piemonte|Puglia|Sardegna|Sicilia|Toscana|Trentino-Alto Adige|Umbria|Valle d'Aosta|Veneto"; // 20 regions (https://en.wikipedia.org/wiki/Regions_of_Italy) +aStates["Jamaica"] = "|Clarendon|Hanover|Kingston|Manchester|Portland|Saint Andrew|Saint Ann|Saint Catherine|Saint Elizabeth|Saint James|Saint Mary|Saint Thomas|Trelawny|Westmoreland"; // 14 parishes (https://en.wikipedia.org/wiki/Parishes_of_Jamaica) +aStates["Japan"] = "|Aichi|Akita|Aomori|Chiba|Ehime|Fukui|Fukuoka|Fukushima|Gifu|Gunma|Hiroshima|Hokkaido|Hyogo|Ibaraki|Ishikawa|Iwate|Kagawa|Kagoshima|Kanagawa|Kochi|Kumamoto|Kyoto|Mie|Miyagi|Miyazaki|Nagano|Nagasaki|Nara|Niigata|Oita|Okayama|Okinawa|Osaka|Saga|Saitama|Shiga|Shimane|Shizuoka|Tochigi|Tokushima|Tokyo|Tottori|Toyama|Wakayama|Yamagata|Yamaguchi|Yamanashi"; // 47 prefectures (https://en.wikipedia.org/wiki/Prefectures_of_Japan) +aStates["Jersey"] = "|Grouville|Saint Brelade|Saint Clement|Saint Helier|Saint John|Saint Lawrence|Saint Martin|Saint Mary|Saint Ouen|Saint Peter|Saint Saviour|Trinity"; // 12 parishes (https://en.wikipedia.org/wiki/Parishes_of_Jersey) +aStates["Jordan"] = "|'Amman|Ajlun|Al 'Aqabah|Al Balqa'|Al Karak|Al Mafraq|At Tafilah|Az Zarqa'|Irbid|Jarash|Ma'an|Madaba"; // 12 governorates (https://en.wikipedia.org/wiki/Governorates_of_Jordan) +aStates["Kazakhstan"] = "|Abai|Almaty|Aqmola|Aqtobe|Astana|Atyrau|Batys Qazaqstan|Bayqongyr|Jetisu|Mangghystau|Pavlodar|Qaraghandy|Qostanay|Qyzylorda|Shyghys Qazaqstan|Soltustik Qazaqstan|Turkistan|Ulytau|Zhambyl"; // 17 regions and 3 cities (https://en.wikipedia.org/wiki/Regions_of_Kazakhstan) +aStates["Kenya"] = "|Baringo|Bomet|Bungoma|Busia|Elgeyo-Marakwet|Embu|Garissa|Homa Bay|Isiolo|Kajiado|Kakamega|Kericho|Kiambu|Kilifi|Kirinyaga|Kisii|Kisumu|Kitui|Kwale|Laikipia|Lamu|Machakos|Makueni|Mandera|Marsabit|Meru|Migori|Mombasa|Murang'a|Nairobi|Nakuru|Nandi|Narok|Nyamira|Nyandarua|Nyeri|Samburu|Siaya|Taita-Taveta|Tana River|Tharaka-Nithi|Trans-Nzoia|Turkana|Uasin Gishu|Vihiga|Wajir|West Pokot"; // 47 counties (https://en.wikipedia.org/wiki/Counties_of_Kenya) +aStates["Kiribati"] = "|Abaiang|Abemama|Aranuka|Arorae|Banaba|Beru|Butaritari|Canton|Kiritimati|Kuria|Maiana|Makin|Marakei|Nikunau|Nonouti|Onotoa|Tabiteuea|Tabuaeran|Tamana|Tarawa|Teraina"; // 21 inhabited islands (https://en.wikipedia.org/wiki/Administrative_divisions_of_Kiribati) +aStates["North Korea"] = "|Chagang-do (Chagang Province)|Hamgyong-bukto (North Hamgyong Province)|Hamgyong-namdo (South Hamgyong Province)|Hwanghae-bukto (North Hwanghae Province)|Hwanghae-namdo (South Hwanghae Province)|Kaesong-si (Kaesong City)|Kangwon-do (Kangwon Province)|Namp'o-si (Namp'o City)|P'yongan-bukto (North P'yongan Province)|P'yongan-namdo (South P'yongan Province)|P'yongyang-si (P'yongyang City)|Rason-si (Rason City)|Ryanggang-do (Ryanggang Province)"; // 13 administrative divisions - 9 provinces + 4 special cities (https://en.wikipedia.org/wiki/Administrative_divisions_of_North_Korea) +aStates["South Korea"] = "|Ch'ungch'ong-bukto|Ch'ungch'ong-namdo|Cheju-do|Cholla-bukto|Cholla-namdo|Inch'on-gwangyoksi|Kangwon-do|Kwangju-gwangyoksi|Kyonggi-do|Kyongsang-bukto|Kyongsang-namdo|Pusan-gwangyoksi|Soul-t'ukpyolsi|Taegu-gwangyoksi|Taejon-gwangyoksi|Ulsan-gwangyoksi"; // 16 administrative divisions (https://en.wikipedia.org/wiki/Administrative_divisions_of_South_Korea) +aStates["Kosovo"] = "|Ferizaj|Gjakova|Gjilan|Mitrovica|Peja|Prishtina|Prizren"; // 7 districts (https://en.wikipedia.org/wiki/Districts_of_Kosovo) +aStates["Kuwait"] = "|Al Ahmadi|Al Asimah|Al Farwaniya|Al Jahra|Hawalli|Mubarak Al-Kabeer"; // 6 governorates (https://en.wikipedia.org/wiki/Governorates_of_Kuwait) +aStates["Kyrgyzstan"] = "|Batken|Bishkek|Chüy|Issyk-Kul|Jalal-Abad|Naryn|Osh City|Osh Region|Talas"; // 7 regions + 2 independent cities (https://en.wikipedia.org/wiki/Regions_of_Kyrgyzstan) +aStates["Laos"] = "|Attapeu|Bokèo|Bolikhamxai|Champasak|Houaphanh|Khammouane|Luang Namtha|Luang Prabang|Oudomxay|Phongsaly|Sainyabuli|Salavan|Savannakhet|Sekong|Vientiane Capital|Vientiane Province|Xaisomboun|Xiangkhouang"; // 18 provinces (17 + 1 prefecture) (https://en.wikipedia.org/wiki/Provinces_of_Laos) +aStates["Latvia"] = "|Ādaži|Aizkraukle|Alūksne|Augšdaugava|Balvi|Bauska|Cēsis|Dobele|Gulbene|Jēkabpils|Jelgava|Ķekava|Krāslava|Kuldīga|Limbaži|Līvāni|Ludza|Madona|Mārupe|Ogre|Olaine|Preiļi|Rēzekne|Ropaži|Salaspils|Saldus|Saulkrasti|Sigulda|Smiltene|South Kurzeme|Talsi|Tukums|Valka|Valmiera|Ventspils"; // 42 local government units (7 state cities + 35 municipalities) (https://en.wikipedia.org/wiki/Administrative_divisions_of_Latvia) +aStates["Lebanon"] = "|Akkar|Baalbek-Hermel|Beirut|Beqaa|Keserwan-Jbeil|Mount Lebanon|Nabatieh|North|South"; // 9 governorates (https://en.wikipedia.org/wiki/Governorates_of_Lebanon) +aStates["Lesotho"] = "|Berea|Butha-Buthe|Leribe|Mafeteng|Maseru|Mohale's Hoek|Mokhotlong|Qacha's Nek|Quthing|Thaba-Tseka"; // 10 districts (https://en.wikipedia.org/wiki/Districts_of_Lesotho) +aStates["Liberia"] = "|Bomi|Bong|Gbarpolu|Grand Bassa|Grand Cape Mount|Grand Gedeh|Grand Kru|Lofa|Margibi|Maryland|Montserrado|Nimba|River Gee|Rivercess|Sinoe"; // 15 counties (https://en.wikipedia.org/wiki/Counties_of_Liberia) +aStates["Libya"] = "|Al Butnan|Al Jabal al Akhdar|Al Jabal al Gharbi|Al Jafarah|Al Jufrah|Al Kufrah|Al Marj|Al Wahat|An Nuqat al Khams|Az Zawiyah|Benghazi|Darnah|Ghat|Marqab|Misrata|Murzuq|Nalut|Sabha|Surt|Tarabulus|Wadi al Hayat|Wadi ash Shatii"; // 22 districts (current system since 2007) (https://en.wikipedia.org/wiki/Districts_of_Libya) +aStates["Liechtenstein"] = "|Balzers|Eschen|Gamprin|Mauren|Planken|Ruggell|Schaan|Schellenberg|Triesen|Triesenberg|Vaduz"; // 11 municipalities (Gemeinden) - verified 2025-01-16 via Wikipedia (https://en.wikipedia.org/wiki/List_of_municipalities_of_Liechtenstein) +aStates["Lithuania"] = "|Alytus|Kaunas|Klaipėda|Marijampolė|Panevėžys|Šiauliai|Tauragė|Telšiai|Utena|Vilnius"; // 10 counties (apskritys) - verified 2025-01-16 via Wikipedia (https://en.wikipedia.org/wiki/Counties_of_Lithuania) +aStates["Luxembourg"] = "|Capellen|Clervaux|Diekirch|Echternach|Esch-sur-Alzette|Grevenmacher|Luxembourg|Mersch|Redange|Remich|Vianden|Wiltz"; // 12 cantons - verified 2025-01-16 via Wikipedia (https://en.wikipedia.org/wiki/Cantons_of_Luxembourg) +aStates["Macao"] = "|Coloane|Nossa Senhora de Fátima|Santo António|São Lázaro|São Lourenço|Sé|Taipa"; // 7 parishes (https://en.wikipedia.org/wiki/Parishes_of_Macau) +aStates["Madagascar"] = "|Alaotra-Mangoro|Ambatosoa|Amoron'i Mania|Analamanga|Analanjirofo|Androy|Anosy|Atsimo-Andrefana|Atsimo-Atsinanana|Atsinanana|Betsiboka|Boeny|Bongolava|Diana|Fitovinany|Haute Matsiatra|Ihorombe|Itasy|Melaky|Menabe|Sava|Sofia|Vakinankaratra|Vatovavy"; // 24 regions - verified 2025-01-16 via Wikipedia (includes new Ambatosoa 2025) (https://en.wikipedia.org/wiki/Regions_of_Madagascar) +aStates["Malawi"] = "|Balaka|Blantyre|Chikwawa|Chiradzulu|Chitipa|Dedza|Dowa|Karonga|Kasungu|Likoma|Lilongwe|Machinga|Mangochi|Mchinji|Mulanje|Mwanza|Mzimba|Neno|Nkhata Bay|Nkhotakota|Nsanje|Ntcheu|Ntchisi|Phalombe|Rumphi|Salima|Thyolo|Zomba"; // 28 districts - verified 2025-01-16 via Wikipedia (https://en.wikipedia.org/wiki/Districts_of_Malawi) +aStates["Malaysia"] = "|Johor|Kedah|Kelantan|Kuala Lumpur|Labuan|Melaka|Negeri Sembilan|Pahang|Perak|Perlis|Pulau Pinang|Putrajaya|Sabah|Sarawak|Selangor|Terengganu"; // 16 administrative divisions (13 states + 3 federal territories) (https://en.wikipedia.org/wiki/States_and_federal_territories_of_Malaysia) +aStates["Maldives"] = "|Addu|Alif Alif|Alif Dhaal|Baa|Dhaalu|Faafu|Fuvahmulah|Gaafu Alif|Gaafu Dhaalu|Gnaviyani|Haa Alif|Haa Dhaalu|Kaafu|Kulhudhuffushi|Laamu|Lhaviyani|Malé|Meemu|Noonu|Raa|Shaviyani|Thaa|Thinadhoo|Vaavu"; // 24 administrative divisions (20 atolls + 4 cities, Thinadhoo upgraded to city in 2023) (https://en.wikipedia.org/wiki/Administrative_divisions_of_the_Maldives) +aStates["Mali"] = "|Bamako|Bandiagara|Bougouni|Dioila|Douentza|Gao|Kayes|Kidal|Kita|Koulikoro|Koutiala|Ménaka|Mopti|Nara|Nioro|San|Ségou|Sikasso|Taoudénit|Tombouctou"; // 20 administrative divisions (19 regions + Bamako district, based on administrative reform of 2023) (https://fr.wikipedia.org/wiki/R%C3%A9gions_du_Mali) +aStates["Malta"] = "|Attard|Balzan|Birgu|Birkirkara|Birżebbuġa|Bormla|Dingli|Fgura|Floriana|Fontana|Għajnsielem|Għarb|Għargħur|Għasri|Għaxaq|Gudja|Gżira|Ħamrun|Iklin|Isla|Kalkara|Kerċem|Kirkop|Lija|Luqa|Marsa|Marsaskala|Marsaxlokk|Mdina|Mellieħa|Mġarr|Mosta|Mqabba|Msida|Mtarfa|Munxar|Nadur|Naxxar|Paola|Pembroke|Pietà|Qala|Qormi|Qrendi|Rabat Għawdex|Rabat Malta|Safi|San Ġiljan|San Ġwann|San Lawrenz|San Pawl il-Baħar|Sannat|Santa Luċija|Santa Venera|Siġġiewi|Sliema|Swieqi|Ta' Xbiex|Tarxien|Valletta|Xagħra|Xewkija|Xgħajra|Żabbar|Żebbuġ Għawdex|Żebbuġ Malta|Żejtun|Żurrieq"; // 68 local councils (https://en.wikipedia.org/wiki/Local_councils_of_Malta) +aStates["Marshall Islands"] = "|Ailinglaplap|Ailuk|Arno|Aur|Ebon|Enewetok|Jabat|Jaluit|Kili|Kwajalein|Lae|Lib|Likiep|Majuro|Maloelap|Mejit|Mili|Namorik|Namu|Rongelap|Ujae|Utirik|Wotho|Wotje"; // 24 inhabited municipalities (electoral districts) (https://en.wikipedia.org/wiki/List_of_islands_of_the_Marshall_Islands) +aStates["Martinique"] = "|Basse-Pointe|Bellefontaine|Case-Pilote|Ducos|Fonds-Saint-Denis|Fort-de-France|Grand'Rivière|Gros-Morne|L'Ajoupa-Bouillon|La Trinité|Le Carbet|Le Diamant|Le François|Le Lamentin|Le Lorrain|Le Marigot|Le Marin|Le Morne-Rouge|Le Morne-Vert|Le Prêcheur|Le Robert|Le Vauclin|Les Anses-d'Arlet|Les Trois-Îlets|Macouba|Rivière-Pilote|Rivière-Salée|Saint-Esprit|Saint-Joseph|Saint-Pierre|Sainte-Anne|Sainte-Luce|Sainte-Marie|Schoelcher"; // 34 communes (French overseas collectivity) (https://fr.wikipedia.org/wiki/Liste_des_communes_de_la_Martinique) +aStates["Mauritania"] = "|Adrar|Assaba|Brakna|Dakhlet Nouadhibou|Gorgol|Guidimaka|Hodh Ech Chargui|Hodh El Gharbi|Inchiri|Nouakchott-Nord|Nouakchott-Ouest|Nouakchott-Sud|Tagant|Tiris Zemmour|Trarza"; // 15 regions (wilayas) (https://fr.wikipedia.org/wiki/R%C3%A9gions_de_la_Mauritanie) +aStates["Mauritius"] = "|Flacq|Grand Port|Moka|Pamplemousses|Plaines Wilhems|Port Louis|Rivière du Rempart|Rivière Noire|Savanne"; // 9 districts of Mauritius Island (https://en.wikipedia.org/wiki/Districts_of_Mauritius) +aStates["Mayotte"] = "|Acoua|Bandraboua|Bandrele|Bouéni|Chiconi|Chirongui|Dembeni|Dzaoudzi|Kani-Kéli|Koungou|Mamoudzou|Mtsamboro|Ouangani|Pamandzi|Sada|Tsingoni"; // 16 communes (French overseas collectivity) (https://fr.wikipedia.org/wiki/Liste_des_communes_de_Mayotte) +aStates["Mexico"] = "|Aguascalientes|Baja California|Baja California Sur|Campeche|Chiapas|Chihuahua|Coahuila|Colima|Durango|Guanajuato|Guerrero|Hidalgo|Jalisco|México|Mexico City|Michoacán|Morelos|Nayarit|Nuevo León|Oaxaca|Puebla|Querétaro|Quintana Roo|San Luis Potosí|Sinaloa|Sonora|Tabasco|Tamaulipas|Tlaxcala|Veracruz|Yucatán|Zacatecas"; // 32 federal entities (31 states + Mexico City) (https://en.wikipedia.org/wiki/Administrative_divisions_of_Mexico) +aStates["Micronesia"] = "|Chuuk|Kosrae|Pohnpei|Yap"; // 4 states (https://en.wikipedia.org/wiki/Administrative_divisions_of_the_Federated_States_of_Micronesia) +aStates["Moldova"] = "|Anenii Noi|Bălți|Basarabeasca|Bender|Briceni|Cahul|Călărași|Cantemir|Căușeni|Chișinău|Cimișlia|Criuleni|Dondușeni|Drochia|Dubăsari|Edineț|Fălești|Florești|Gagauzia|Glodeni|Hîncești|Ialoveni|Leova|Nisporeni|Ocnița|Orhei|Rezina|Rîșcani|Sîngerei|Șoldănești|Soroca|Ștefan Vodă|Strășeni|Taraclia|Telenești|Transnistria|Ungheni"; // 37 administrative divisions (32 districts + 3 municipalities + 2 autonomous units) (https://en.wikipedia.org/wiki/Administrative_divisions_of_Moldova) +aStates["Monaco"] = "|Fontvieille|La Condamine|Monaco-Ville|Monte-Carlo"; // 4 quartiers (https://en.wikipedia.org/wiki/Administrative_divisions_of_Monaco) +aStates["Mongolia"] = "|Arkhangai|Bayan-Ölgii|Bayankhongor|Bulgan|Darkhan-Uul|Dornod|Dornogovi|Dundgobi|Govi-Altai|Govisümber|Khentii|Khovd|Khövsgöl|Ömnögovi|Orkhon|Övörkhangai|Selenge|Sükhbaatar|Töv|Ulaanbaatar|Uvs|Zavkhan"; // 22 administrative divisions (21 provinces + Ulaanbaatar capital municipality) (https://en.wikipedia.org/wiki/Provinces_of_Mongolia) +aStates["Montenegro"] = "|Andrijevica|Bar|Berane|Bijelo Polje|Cetinje|Danilovgrad|Gusinje|Herceg Novi|Kolašin|Kotor|Mojkovac|Nikšić|Petnjica|Plav|Pljevlja|Plužine|Podgorica|Rožaje|Šavnik|Tivat|Tuzi|Ulcinj|Žabljak|Zeta"; // 25 municipalities (https://en.wikipedia.org/wiki/Municipalities_of_Montenegro) +aStates["Montserrat"] = "|Saint Anthony|Saint Georges|Saint Peter's"; // 3 parishes (https://en.wikipedia.org/wiki/Administrative_divisions_of_Montserrat) +aStates["Morocco"] = "|Béni Mellal-Khénifra|Casablanca-Settat|Dakhla-Oued Ed-Dahab|Drâa-Tafilalet|Fès-Meknès|Guelmim-Oued Noun|L'Oriental|Laâyoune-Sakia El Hamra|Marrakech-Safi|Rabat-Salé-Kénitra|Souss-Massa|Tanger-Tetouan-Al Hoceima"; // 12 regions (since 2015) (https://en.wikipedia.org/wiki/Regions_of_Morocco) +aStates["Mozambique"] = "|Cabo Delgado|Gaza|Inhambane|Manica|Maputo|Maputo City|Nampula|Niassa|Sofala|Tete|Zambezia"; // 11 administrative divisions (10 provinces + Maputo City) (https://en.wikipedia.org/wiki/Provinces_of_Mozambique) +aStates["Myanmar"] = "|Ayeyarwady|Bago|Chin State|Kachin State|Kayah State|Kayin State|Magway|Mandalay|Mon State|Naypyitaw|Rakhine State|Sagaing|Shan State|Tanintharyi|Yangon"; // 15 administrative divisions (7 states + 7 regions + 1 union territory) (https://en.wikipedia.org/wiki/Administrative_divisions_of_Myanmar) +aStates["Namibia"] = "|ǡKaras|Erongo|Hardap|Kavango East|Kavango West|Khomas|Kunene|Ohangwena|Omaheke|Omusati|Oshana|Oshikoto|Otjozondjupa|Zambezi"; // 14 regions (updated 2025-01-16: Caprivi→Zambezi, Okavango split into East/West, added Unicode ǡKaras) (https://en.wikipedia.org/wiki/Regions_of_Namibia) +aStates["Nauru"] = "|Aiwo|Anabar|Anetan|Anibare|Baiti|Boe|Buada|Denigomodu|Ewa|Ijuw|Meneng|Nibok|Uaboe|Yaren"; // 14 districts (https://en.wikipedia.org/wiki/Administrative_divisions_of_Nauru) +aStates["Nepal"] = "|Bagmati|Gandaki|Karnali|Koshi|Lumbini|Madhesh|Sudurpashchim"; // 7 provinces (since 2015, replaced old 14 zones) (https://en.wikipedia.org/wiki/Provinces_of_Nepal) +aStates["Netherlands"] = "|Drenthe|Flevoland|Friesland|Gelderland|Groningen|Limburg|Noord-Brabant|Noord-Holland|Overijssel|Utrecht|Zeeland|Zuid-Holland"; // 12 provinces (https://en.wikipedia.org/wiki/Provinces_of_the_Netherlands) +aStates["New Caledonia"] = "|Iles Loyaute|Nord|Sud"; // 3 provinces (https://en.wikipedia.org/wiki/Administrative_divisions_of_New_Caledonia) +aStates["New Zealand"] = "|Akaroa|Amuri|Ashburton|Bay of Islands|Bruce|Buller|Chatham Islands|Cheviot|Clifton|Clutha|Cook|Dannevirke|Egmont|Eketahuna|Ellesmere|Eltham|Eyre|Featherston|Franklin|Golden Bay|Great Barrier Island|Grey|Hauraki Plains|Hawera|Hawke's Bay|Heathcote|Hikurangi|Hobson|Hokianga|Horowhenua|Hutt|Inangahua|Inglewood|Kaikoura|Kairanga|Kiwitea|Lake|Mackenzie|Malvern|Manaia|Manawatu|Mangonui|Maniototo|Marlborough|Masterton|Matamata|Mount Herbert|Ohinemuri|Opotiki|Oroua|Otamatea|Otorohanga|Oxford|Pahiatua|Paparua|Patea|Piako|Pohangina|Raglan|Rangiora|Rangitikei|Rodney|Rotorua|Runanga|Saint Kilda|Silverpeaks|Southland|Stewart Island|Stratford|Strathallan|Taranaki|Taumarunui|Taupo|Tauranga|Thames-Coromandel|Tuapeka|Vincent|Waiapu|Waiheke|Waihemo|Waikato|Waikohu|Waimairi|Waimarino|Waimate|Waimate West|Waimea|Waipa|Waipawa|Waipukurau|Wairarapa South|Wairewa|Wairoa|Waitaki|Waitomo|Waitotara|Wallace|Wanganui|Waverley|Westland|Whakatane|Whangarei|Whangaroa|Woodville"; // 16 regions (https://en.wikipedia.org/wiki/Regions_of_New_Zealand) +aStates["Nicaragua"] = "|Atlantico Norte|Atlantico Sur|Boaco|Carazo|Chinandega|Chontales|Esteli|Granada|Jinotega|Leon|Madriz|Managua|Masaya|Matagalpa|Nueva Segovia|Rio San Juan|Rivas"; // 17 administrative divisions (15 departments + 2 autonomous regions) (https://en.wikipedia.org/wiki/Departments_of_Nicaragua) +aStates["Niger"] = "|Agadez|Diffa|Dosso|Maradi|Niamey|Tahoua|Tillaberi|Zinder"; // 8 administrative divisions (7 regions + Niamey capital district) (https://en.wikipedia.org/wiki/Regions_of_Niger) +aStates["Nigeria"] = "|Abia|Abuja Federal Capital Territory|Adamawa|Akwa Ibom|Anambra|Bauchi|Bayelsa|Benue|Borno|Cross River|Delta|Ebonyi|Edo|Ekiti|Enugu|Gombe|Imo|Jigawa|Kaduna|Kano|Katsina|Kebbi|Kogi|Kwara|Lagos|Nassarawa|Niger|Ogun|Ondo|Osun|Oyo|Plateau|Rivers|Sokoto|Taraba|Yobe|Zamfara"; // 37 administrative divisions (36 states + Federal Capital Territory) (https://en.wikipedia.org/wiki/States_of_Nigeria) +aStates["Niue"] = "|Alofi North|Alofi South|Avatele|Hakupu|Hikutavake|Lakepa|Liku|Makefu|Mutalau|Namukulu|Tamakautoga|Toi|Tuapa|Vaiea"; // 14 villages (https://en.wikipedia.org/wiki/Villages_of_Niue) +aStates["Norfolk Island"] = "|Anson Bay|Ball Bay|Bumboras|Burnt Pine|Cascade|Crystal Pool|Duncombe Bay|Kingston|Longridge|Rocky Point"; // 10 localities (https://en.wikipedia.org/wiki/Administrative_divisions_of_Norfolk_Island) +aStates["North Macedonia"] = "|Eastern|Northeastern|Pelagonia|Polog|Skopje|Southeastern|Southwestern|Vardar"; // 8 statistical regions (https://en.wikipedia.org/wiki/Statistical_regions_of_North_Macedonia) +aStates["Northern Mariana Islands"] = "|Northern Islands|Rota|Saipan|Tinian"; // 4 municipalities (https://en.wikipedia.org/wiki/Administrative_divisions_of_the_Northern_Mariana_Islands) +aStates["Norway"] = "|Agder|Akershus|Buskerud|Finnmark|Innlandet|Møre og Romsdal|Nordland|Oslo|Østfold|Rogaland|Telemark|Troms|Trøndelag|Vestfold|Vestland"; // 15 counties (since 2024, updated from 19 pre-2020 structure) (https://en.wikipedia.org/wiki/Counties_of_Norway) +aStates["Oman"] = "|Ad Dakhiliyah|Ad Dhahirah|Al Batinah North|Al Batinah South|Al Buraimi|Al Wusta|Ash Sharqiyah North|Ash Sharqiyah South|Dhofar|Musandam|Muscat"; // 11 governorates (since 2011) - Al Batinah/Ash Sharqiyah split, Al Buraimi added, updated Arabic names (https://en.wikipedia.org/wiki/Governorates_of_Oman) +aStates["Pakistan"] = "|Azad Kashmir|Balochistan|Gilgit-Baltistan|Islamabad Capital Territory|Khyber Pakhtunkhwa|Punjab|Sindh"; // 7 administrative units (4 provinces + 1 federal territory + 2 autonomous territories) - FATA merged into KPK (2018), NWFP renamed (2010) (https://en.wikipedia.org/wiki/Administrative_units_of_Pakistan) +aStates["Palau"] = "|Aimeliik|Airai|Angaur|Hatohobei|Kayangel|Koror|Melekeok|Ngaraard|Ngarchelong|Ngardmau|Ngatpang|Ngchesar|Ngeremlengui|Ngiwal|Peleliu|Sonsorol"; // Updated: 16 states (removed "Palau Island", "Sonsoral", "Tobi" - Sonsorol includes Sonsoral and Tobi islands, Hatohobei includes Hatohobei) (https://en.wikipedia.org/wiki/States_of_Palau) +aStates["Palestine"] = "|Gaza Strip|West Bank"; // 2 territories under Palestinian Authority (Gaza Strip and West Bank) (https://en.wikipedia.org/wiki/Palestinian_territories) +aStates["Panama"] = "|Bocas del Toro|Chiriqui|Cocle|Colon|Darien|Emberá-Wounaan|Guna Yala|Herrera|Los Santos|Ngäbe-Buglé|Panama|Panamá Oeste|Veraguas"; // Updated: San Blas renamed to Guna Yala, added Panamá Oeste province (2014), added major comarcas (https://en.wikipedia.org/wiki/Provinces_of_Panama) +aStates["Papua New Guinea"] = "|Bougainville|Central|Chimbu|East New Britain|East Sepik|Eastern Highlands|Enga|Gulf|Hela|Jiwaka|Madang|Manus|Milne Bay|Morobe|National Capital|New Ireland|Northern|Sandaun|Southern Highlands|West New Britain|Western|Western Highlands"; // 22 provinces (https://en.wikipedia.org/wiki/Provinces_of_Papua_New_Guinea) +aStates["Paraguay"] = "|Alto Paraguay|Alto Parana|Amambay|Asuncion (city)|Boqueron|Caaguazu|Caazapa|Canindeyu|Central|Concepcion|Cordillera|Guaira|Itapua|Misiones|Neembucu|Paraguari|Presidente Hayes|San Pedro"; // 18 administrative units (17 departments + 1 capital district) (https://en.wikipedia.org/wiki/Departments_of_Paraguay) +aStates["Peru"] = "|Amazonas|Ancash|Apurimac|Arequipa|Ayacucho|Cajamarca|Callao|Cusco|Huancavelica|Huanuco|Ica|Junin|La Libertad|Lambayeque|Lima|Loreto|Madre de Dios|Moquegua|Pasco|Piura|Puno|San Martin|Tacna|Tumbes|Ucayali"; // 25 regions (24 departments/regions + 1 constitutional province Callao) (https://en.wikipedia.org/wiki/Regions_of_Peru) +aStates["Philippines"] = "|Abra|Agusan del Norte|Agusan del Sur|Aklan|Albay|Antique|Apayao|Aurora|Basilan|Bataan|Batanes|Batangas|Benguet|Biliran|Bohol|Bukidnon|Bulacan|Cagayan|Camarines Norte|Camarines Sur|Camiguin|Capiz|Catanduanes|Cavite|Cebu|Cotabato|Davao de Oro|Davao del Norte|Davao del Sur|Davao Occidental|Davao Oriental|Dinagat Islands|Eastern Samar|Guimaras|Ifugao|Ilocos Norte|Ilocos Sur|Iloilo|Isabela|Kalinga|La Union|Laguna|Lanao del Norte|Lanao del Sur|Leyte|Maguindanao del Norte|Maguindanao del Sur|Marinduque|Masbate|Misamis Occidental|Misamis Oriental|Mountain Province|Negros Occidental|Negros Oriental|Northern Samar|Nueva Ecija|Nueva Vizcaya|Occidental Mindoro|Oriental Mindoro|Palawan|Pampanga|Pangasinan|Quezon|Quirino|Rizal|Romblon|Samar|Sarangani|Siquijor|Sorsogon|South Cotabato|Southern Leyte|Sultan Kudarat|Sulu|Surigao del Norte|Surigao del Sur|Tarlac|Tawi-Tawi|Western Samar|Zambales|Zamboanga del Norte|Zamboanga del Sur|Zamboanga Sibugay"; // 82 provinces (corrected from problematic mix of provinces/cities to official provinces only per Wikipedia 2022) (https://en.wikipedia.org/wiki/Provinces_of_the_Philippines) +aStates["Pitcairn Islands"] = "|Adamstown|Bounty Bay|Down Rope|Kingston|Pulau|St. Paul's|Tedside|The Edge"; // 8 small settlements on Pitcairn Island (https://en.wikipedia.org/wiki/Pitcairn_Islands) +aStates["Poland"] = "|Dolnoslaskie|Kujawsko-Pomorskie|Lodzkie|Lubelskie|Lubuskie|Malopolskie|Mazowieckie|Opolskie|Podkarpackie|Podlaskie|Pomorskie|Slaskie|Swietokrzyskie|Warminsko-Mazurskie|Wielkopolskie|Zachodniopomorskie"; // 16 voivodeships (administrative regions) (https://en.wikipedia.org/wiki/Voivodeships_of_Poland) +aStates["Portugal"] = "|Acores (Azores)|Aveiro|Beja|Braga|Braganca|Castelo Branco|Coimbra|Evora|Faro|Guarda|Leiria|Lisboa|Madeira|Portalegre|Porto|Santarem|Setubal|Viana do Castelo|Vila Real|Viseu"; // 20 administrative units (18 districts + 2 autonomous regions) (https://en.wikipedia.org/wiki/Districts_of_Portugal) +aStates["Puerto Rico"] = "|Adjuntas|Aguada|Aguadilla|Aguas Buenas|Aibonito|Anasco|Arecibo|Arroyo|Barceloneta|Barranquitas|Bayamon|Cabo Rojo|Caguas|Camuy|Canovanas|Carolina|Catano|Cayey|Ceiba|Ciales|Cidra|Coamo|Comerio|Corozal|Culebra|Dorado|Fajardo|Florida|Guanica|Guayama|Guayanilla|Guaynabo|Gurabo|Hatillo|Hormigueros|Humacao|Isabela|Jayuya|Juana Diaz|Juncos|Lajas|Lares|Las Marias|Las Piedras|Loiza|Luquillo|Manati|Maricao|Maunabo|Mayaguez|Moca|Morovis|Naguabo|Naranjito|Orocovis|Patillas|Penuelas|Ponce|Quebradillas|Rincon|Rio Grande|Sabana Grande|Salinas|San German|San Juan|San Lorenzo|San Sebastian|Santa Isabel|Toa Alta|Toa Baja|Trujillo Alto|Utuado|Vega Alta|Vega Baja|Vieques|Villalba|Yabucoa|Yauco"; // 78 municipalities (complete list of Puerto Rican municipios) (https://en.wikipedia.org/wiki/List_of_municipalities_of_Puerto_Rico) +aStates["Qatar"] = "|Ad Dawhah|Al Daayen|Al Khor|Al Rayyan|Al Shamal|Al Wakrah|Al-Shahaniya|Umm Salal"; // Updated: 8 current municipalities (removed Al Ghuwayriyah, Al Jumayliyah, Jarayan al Batinah - merged in 2004; added Al Daayen 2004, Al-Shahaniya 2014) (https://en.wikipedia.org/wiki/Municipalities_of_Qatar) +aStates["Réunion"] = "|Bras-Panon|Cilaos|Entre-Deux|L'Étang-Salé|La Plaine-des-Palmistes|La Possession|Le Port|Le Tampon|Les Avirons|Les Trois-Bassins|Petite-Île|Saint-André|Saint-Benoît|Saint-Denis|Saint-Joseph|Saint-Leu|Saint-Louis|Saint-Paul|Saint-Philippe|Saint-Pierre|Sainte-Marie|Sainte-Rose|Sainte-Suzanne|Salazie"; // 24 communes (French overseas department) (https://en.wikipedia.org/wiki/Administrative_divisions_of_R%C3%A9union) +aStates["Romania"] = "|Alba|Arad|Argeș|Bacău|Bihor|Bistrița-Năsăud|Botoșani|Brăila|Brașov|Bucharest|Buzău|Călărași|Caraș-Severin|Cluj|Constanța|Covasna|Dâmbovița|Dolj|Galați|Giurgiu|Gorj|Harghita|Hunedoara|Ialomița|Iași|Ilfov|Maramureș|Mehedinți|Mureș|Neamț|Olt|Prahova|Sălaj|Satu Mare|Sibiu|Suceava|Teleorman|Timiș|Tulcea|Vâlcea|Vaslui|Vrancea"; // 41 counties (40 județe + Bucharest municipality with correct diacritical marks) (https://en.wikipedia.org/wiki/Counties_of_Romania) +aStates["Russian Federation"] = "|Adygea (Maykop)|Altai Krai (Barnaul)|Altai Republic (Gorno-Altaysk)|Amur Oblast (Blagoveshchensk)|Arkhangelsk Oblast (Arkhangelsk)|Astrakhan Oblast (Astrakhan)|Bashkortostan (Ufa)|Belgorod Oblast (Belgorod)|Bryansk Oblast (Bryansk)|Buryatia (Ulan-Ude)|Chechnya (Grozny)|Chelyabinsk Oblast (Chelyabinsk)|Chukotka Autonomous Okrug (Anadyr)|Chuvashia (Cheboksary)|Dagestan (Makhachkala)|Ingushetia (Magas)|Irkutsk Oblast (Irkutsk)|Ivanovo Oblast (Ivanovo)|Jewish Autonomous Oblast (Birobidzhan)|Kabardino-Balkaria (Nalchik)|Kaliningrad Oblast (Kaliningrad)|Kalmykia (Elista)|Kaluga Oblast (Kaluga)|Kamchatka Krai (Petropavlovsk-Kamchatsky)|Karachay-Cherkessia (Cherkessk)|Karelia (Petrozavodsk)|Kemerovo Oblast (Kemerovo)|Khabarovsk Krai (Khabarovsk)|Khakassia (Abakan)|Khanty-Mansi Autonomous Okrug (Khanty-Mansiysk)|Kirov Oblast (Kirov)|Komi Republic (Syktyvkar)|Kostroma Oblast (Kostroma)|Krasnodar Krai (Krasnodar)|Krasnoyarsk Krai (Krasnoyarsk)|Kurgan Oblast (Kurgan)|Kursk Oblast (Kursk)|Leningrad Oblast (Gatchina)|Lipetsk Oblast (Lipetsk)|Magadan Oblast (Magadan)|Mari El (Yoshkar-Ola)|Mordovia (Saransk)|Moscow (Moscow)|Moscow Oblast (Balashikha)|Murmansk Oblast (Murmansk)|Nenets Autonomous Okrug (Naryan-Mar)|Nizhny Novgorod Oblast (Nizhny Novgorod)|North Ossetia–Alania (Vladikavkaz)|Novgorod Oblast (Veliky Novgorod)|Novosibirsk Oblast (Novosibirsk)|Omsk Oblast (Omsk)|Orenburg Oblast (Orenburg)|Oryol Oblast (Oryol)|Penza Oblast (Penza)|Perm Krai (Perm)|Primorsky Krai (Vladivostok)|Pskov Oblast (Pskov)|Rostov Oblast (Rostov-on-Don)|Ryazan Oblast (Ryazan)|Saint Petersburg (Saint Petersburg)|Sakha (Yakutsk)|Sakhalin Oblast (Yuzhno-Sakhalinsk)|Samara Oblast (Samara)|Saratov Oblast (Saratov)|Smolensk Oblast (Smolensk)|Stavropol Krai (Stavropol)|Sverdlovsk Oblast (Yekaterinburg)|Tambov Oblast (Tambov)|Tatarstan (Kazan)|Tomsk Oblast (Tomsk)|Tula Oblast (Tula)|Tuva (Kyzyl)|Tver Oblast (Tver)|Tyumen Oblast (Tyumen)|Udmurtia (Izhevsk)|Ulyanovsk Oblast (Ulyanovsk)|Vladimir Oblast (Vladimir)|Volgograd Oblast (Volgograd)|Vologda Oblast (Vologda)|Voronezh Oblast (Voronezh)|Yamalo-Nenets Autonomous Okrug (Salekhard)|Yaroslavl Oblast (Yaroslavl)|Zabaykalsky Krai (Chita)"; // 83 federal subjects: 21 republics, 9 krais, 46 oblasts, 2 federal cities, 1 autonomous oblast, 4 autonomous okrugs (merged autonomous okrugs from 2005-2008 reforms included) (https://en.wikipedia.org/wiki/Federal_subjects_of_Russia) +aStates["Rwanda"] = "|Eastern|Kigali|Northern|Southern|Western"; // 5 current provinces since 2006 administrative reform (replaced 12 old provinces/prefectures) (https://en.wikipedia.org/wiki/Provinces_of_Rwanda) +aStates["Saint Barthélemy"] = "|Anse des Cayes|Anse des Lézards|Anse du Gouverneur|Barrière des Quatres Vents|Camaruche|Carénage|Col de la Tourmente|Colombier|Corossol|Devet|Flamands|Grand Cul-de-Sac|Grand Fond|Grande Saline|Grande Vigie|Gustavia|Gustavia|La Grande Montagne|La Pointe|Le Château|Le Palidor|Lorient|Lurin|Merlette|Morne Criquet|Morne de Dépoudré|Morne Rouge|Petite Saline|Pointe Milou|Public|Quartier du Roi|Saint-Jean|Terre Neuve|Toiny|Vitet"; // Overseas collectivity of France - 40 quartiers grouped into 2 paroisses (parishes). Capital: Gustavia (https://en.wikipedia.org/wiki/Saint_Barth%C3%A9lemy) +aStates["Saint Helena, Ascension and Tristan da Cunha"] = "|Alarm Forest|Blue Hill|Edinburgh of the Seven Seas|Georgetown|Half Tree Hollow|Jamestown|Longwood|Saint Paul's|Sandy Bay"; // British Overseas Territory - Saint Helena (8 districts), Ascension Island (Georgetown), Tristan da Cunha (Edinburgh of the Seven Seas). Capital: Jamestown (https://en.wikipedia.org/wiki/Saint_Helena) +aStates["Saint Kitts and Nevis"] = "|Basseterre|Christ Church Nichola Town|Saint Anne Sandy Point|Saint George Basseterre|Saint George Gingerland|Saint James Windward|Saint John Capisterre|Saint John Figtree|Saint Mary Cayon|Saint Paul Capisterre|Saint Paul Charlestown|Saint Peter Basseterre|Saint Thomas Lowland|Saint Thomas Middle Island|Trinity Palmetto Point"; // Federation - 14 parishes: 9 on Saint Kitts, 5 on Nevis. Capital: Basseterre (https://en.wikipedia.org/wiki/Saint_Kitts_and_Nevis) +aStates["Saint Lucia"] = "|Anse la Raye|Canaries|Castries|Choiseul|Dennery|Gros Islet|Laborie|Micoud|Soufrière|Vieux Fort"; // 10 districts. Capital: Castries. Former quarters Dauphin and Praslin were merged into Gros Islet and Micoud respectively (https://en.wikipedia.org/wiki/Saint_Lucia) +aStates["Saint Martin"] = "|Cole Bay|Cul de Sac|Grand-Case|Little Bay|Lower Prince's Quarter|Lowlands|Marigot|Philipsburg|Quartier-d'Orleans|Simpson Bay|Upper Prince's Quarter"; // Divided island: French Saint Martin (capital Marigot) and Dutch Sint Maarten (capital Philipsburg). Treaty of Concordia 1648 (https://en.wikipedia.org/wiki/Saint_Martin) +aStates["Saint Pierre and Miquelon"] = "|Isle-aux-Marins (former commune until 1945)|Langlade|Miquelon|Miquelon-Langlade|Saint-Pierre|Saint-Pierre (capital)"; // French overseas collectivity: 2 communes (Saint-Pierre and Miquelon-Langlade) (https://en.wikipedia.org/wiki/Saint_Pierre_and_Miquelon) +aStates["Saint Vincent and the Grenadines"] = "|Barrouallie|Charlotte Parish|Chateaubelair|Georgetown|Grenadines Parish|Kingstown (capital)|Layou|Port Elizabeth|Saint Andrew Parish|Saint David Parish|Saint George Parish|Saint Patrick Parish"; // 6 parishes + 1 dependency (Grenadines) (https://en.wikipedia.org/wiki/Saint_Vincent_and_the_Grenadines) +aStates["Samoa"] = "|A'ana|Afega|Aiga-i-le-Tai|Apia (capital)|Asau|Atua|Fa'asaleleaga|Gaga'emauga|Gagaifomauga|Leulumoega|Lufilufi|Mulifanua|Palauli|Safotu|Safotulafai|Saleaula|Samamea|Satupa'itea|Tuamasaga|Va'a-o-Fonoti|Vailoa|Vaisigano"; // 11 traditional districts + capital (https://en.wikipedia.org/wiki/Samoa) +aStates["San Marino"] = "|Acquaviva|Borgo Maggiore|Chiesanuova|City of San Marino|Domagnano|Faetano|Fiorentino|Montegiardino|Serravalle"; // 9 castelli (https://en.wikipedia.org/wiki/San_Marino) +aStates["São Tomé and Príncipe"] = "|Água Grande|Cantagalo|Caué|Lembá|Lobata|Mé-Zóchi|Pagué"; // 7 districts (https://en.wikipedia.org/wiki/S%C3%A3o_Tom%C3%A9_and_Pr%C3%ADncipe) +aStates["Saudi Arabia"] = "|'Asir|Al-Baha|Al-Jawf|Al-Qassim|Eastern Province|Hail|Jazan|Mecca|Medina|Najran|Northern Borders|Riyadh|Tabuk"; // 13 provinces (administrative regions) (https://en.wikipedia.org/wiki/Provinces_of_Saudi_Arabia) +aStates["Senegal"] = "|Dakar|Diourbel|Fatick|Kaffrine|Kaolack|Kédougou|Kolda|Louga|Matam|Saint-Louis|Sédhiou|Tambacounda|Thiès|Ziguinchor"; // 14 regions (https://en.wikipedia.org/wiki/Regions_of_Senegal) +aStates["Serbia"] = "|Belgrade|Bor|Braničevo|Kolubara|Mačva|Moravički|Nišava|North Bačka|North Banat|Pčinja|Peć|Pirot|Podunavlje|Pomoravlje|Rasina|Raška|South Bačka|South Banat|Srem|Šumadija|Toplica|West Bačka|Zaječar|Zlatibor"; // 24 districts (https://en.wikipedia.org/wiki/Serbia) +aStates["Seychelles"] = "|Anse aux Pins|Anse Boileau|Anse Etoile|Anse Royale|Au Cap|Baie Lazare|Baie Sainte Anne|Beau Vallon|Bel Air|Bel Ombre|Cascade|English River|Glacis|Grand'Anse Mahe|Grand'Anse Praslin|La Digue and Inner Islands|Les Mamelles|Mont Buxton|Mont Fleuri|Outer Islands|Plaisance|Pointe La Rue|Port Glaud|Roche Caiman|Saint Louis|Takamaka"; // 26 administrative districts (https://en.wikipedia.org/wiki/Seychelles) +aStates["Sierra Leone"] = "|Bo|Bombali|Bonthe|Falaba|Kailahun|Kambia|Karene|Kenema|Koinadugu|Kono|Moyamba|Port Loko|Pujehun|Tonkolili|Western Area Rural|Western Area Urban"; // 14 districts (https://en.wikipedia.org/wiki/Sierra_Leone) +aStates["Singapore"] = "|Central Region|East Region|North Region|North-East Region|West Region"; // 5 planning regions (https://en.wikipedia.org/wiki/Regions_of_Singapore) +aStates["Sint Maarten"] = "|Cole Bay|Cul de Sac|Little Bay|Lower Prince's Quarter|Lowlands|Philipsburg|Simpson Bay|Upper Prince's Quarter"; // 8 districts (Dutch part of Saint Martin island) (https://en.wikipedia.org/wiki/Sint_Maarten) +aStates["Slovakia"] = "|Banskobystricky|Bratislavsky|Kosicky|Nitriansky|Presovsky|Trenciansky|Trnavsky|Zilinsky"; // 8 regions (kraje) (https://en.wikipedia.org/wiki/Regions_of_Slovakia) +aStates["Slovenia"] = "|gorenjska|goriška|jugovzhodna Slovenija|koroška|obalno-kraška|osrednjeslovenska|podravska|pomurska|posavska|primorsko-notranjska|savinjska|zasavska"; // 12 statistical regions (https://en.wikipedia.org/wiki/Statistical_regions_of_Slovenia) +aStates["Solomon Islands"] = "|Central|Choiseul|Guadalcanal|Isabel|Makira-Ulawa|Malaita|Rennell and Bellona|Temotu|Western"; // 9 provinces (https://en.wikipedia.org/wiki/Provinces_of_Solomon_Islands) +aStates["Somalia"] = "|Awdal|Bakool|Banaadir|Bari|Bay|Galguduud|Gedo|Hiiraan|Jubbada Dhexe|Jubbada Hoose|Mudug|Nugaal|Sanaag|Shabeellaha Dhexe|Shabeellaha Hoose|Sool|Togdheer|Woqooyi Galbeed"; // 18 regions (https://en.wikipedia.org/wiki/Administrative_divisions_of_Somalia) +aStates["South Africa"] = "|Eastern Cape|Free State|Gauteng|KwaZulu-Natal|Limpopo|Mpumalanga|North West|Northern Cape|Western Cape"; // 9 provinces (https://en.wikipedia.org/wiki/Provinces_of_South_Africa) +aStates["South Georgia and South Sandwich Islands"] = "|South Georgia|South Sandwich Islands"; // No permanent population, no administrative divisions - consists of South Georgia and the South Sandwich Islands (https://en.wikipedia.org/wiki/South_Georgia_and_the_South_Sandwich_Islands) +aStates["South Sudan"] = "|Abyei Area|Central Equatoria|Eastern Equatoria|Greater Pibor Area|Jonglei|Lakes|Northern Bahr el Ghazal|Ruweng Area|Unity|Upper Nile|Warrap|Western Bahr el Ghazal|Western Equatoria"; // 10 states and 3 administrative areas (https://en.wikipedia.org/wiki/States_of_South_Sudan) +aStates["Spain"] = "|Andalucía|Aragón|Asturias|Cantabria|Castilla y León|Castilla-La Mancha|Cataluña|Ceuta|Comunidad Valenciana|Extremadura|Galicia|Islas Baleares|Islas Canarias|La Rioja|Madrid|Melilla|Murcia|Navarra|País Vasco"; // 17 autonomous communities + 2 autonomous cities (https://en.wikipedia.org/wiki/Autonomous_communities_of_Spain) +aStates["Sri Lanka"] = "|Central|Eastern|North Central|North Western|Northern|Sabaragamuwa|Southern|Uva|Western"; // 9 provinces (https://en.wikipedia.org/wiki/Provinces_of_Sri_Lanka) +aStates["Sudan"] = "|Al Qadarif|Blue Nile|Central Darfur|East Darfur|Gezira|Kassala|Khartoum|North Darfur|North Kordofan|Northern|Red Sea|River Nile|Sennar|South Darfur|South Kordofan|West Darfur|West Kordofan|White Nile"; // 18 states (https://en.wikipedia.org/wiki/States_of_Sudan) +aStates["Suriname"] = "|Brokopondo|Commewijne|Coronie|Marowijne|Nickerie|Para|Paramaribo|Saramacca|Sipaliwini|Wanica"; // 10 districts (https://en.wikipedia.org/wiki/Districts_of_Suriname) +aStates["Svalbard and Jan Mayen"] = "|Barentsøya|Bjørnøya|Edgeøya|Hopen|Jan Mayen|Nordaustlandet|Prins Karls Forland|Spitsbergen"; // Norwegian territories: Svalbard (unincorporated area, no administrative divisions - main islands listed) and Jan Mayen (uninhabited island) (https://en.wikipedia.org/wiki/Svalbard) +aStates["Sweden"] = "|Blekinge|Dalarna|Gävleborg|Gotland|Halland|Jämtland|Jönköping|Kalmar|Kronoberg|Norrbotten|Örebro|Östergötland|Skåne|Södermanland|Stockholm|Uppsala|Värmland|Västerbotten|Västernorrland|Västmanland|Västra Götaland"; // 21 counties (län) (https://en.wikipedia.org/wiki/Counties_of_Sweden) +aStates["Switzerland"] = "|Aargau|Appenzell Ausserrhoden|Appenzell Innerrhoden|Basel-Landschaft|Basel-Stadt|Bern|Freiburg|Genève|Glarus|Graubünden|Jura|Luzern|Neuenburg|Nidwalden|Obwalden|Schaffhausen|Schwyz|Solothurn|St. Gallen|Thurgau|Ticino|Uri|Valais|Vaud|Zug|Zürich"; // 26 cantons (https://en.wikipedia.org/wiki/Cantons_of_Switzerland) +aStates["Syria"] = "|Al-Hasakah|Aleppo|Damascus|Daraa|Deir ez-Zor|Hama|Homs|Idlib|Latakia|Quneitra|Raqqa|Rif Dimashq|Suwayda|Tartus"; // 14 governorates (https://en.wikipedia.org/wiki/Governorates_of_Syria) +aStates["Taiwan"] = "|Changhua|Chiayi|Chiayi (City)|Hsinchu|Hsinchu (City)|Hualien|Kaohsiung|Keelung|Kinmen|Lienchiang|Miaoli|Nantou|New Taipei|Penghu|Pingtung|Taichung|Tainan|Taipei|Taitung|Taoyuan|Yilan|Yunlin"; // 22 administrative divisions (13 counties, 6 special municipalities, 3 cities) (https://en.wikipedia.org/wiki/Administrative_divisions_of_Taiwan) +aStates["Tajikistan"] = "|Dushanbe|Khatlon|Kuhistoni Badakhshon|Nohiyahoi Tobei Jumhurí|Sughd"; // 5 administrative divisions (https://en.wikipedia.org/wiki/Regions_of_Tajikistan) +aStates["Tanzania"] = "|Arusha|Dar es Salaam|Dodoma|Geita|Iringa|Kagera|Kaskazini Pemba|Kaskazini Unguja|Katavi|Kigoma|Kilimanjaro|Kusini Pemba|Kusini Unguja|Lindi|Manyara|Mara|Mbeya|Mjini Magharibi|Morogoro|Mtwara|Mwanza|Njombe|Pwani|Rukwa|Ruvuma|Shinyanga|Simiyu|Singida|Songwe|Tabora|Tanga"; // 31 regions (https://en.wikipedia.org/wiki/Regions_of_Tanzania) +aStates["Thailand"] = "|Amnat Charoen|Ang Thong|Bueng Kan|Buriram|Chachoengsao|Chai Nat|Chaiyaphum|Chanthaburi|Chiang Mai|Chiang Rai|Chonburi|Chumphon|Kalasin|Kamphaeng Phet|Kanchanaburi|Khon Kaen|Krabi|Krung Thep Maha Nakhon (Bangkok)|Lampang|Lamphun|Loei|Lopburi|Mae Hong Son|Maha Sarakham|Mukdahan|Nakhon Nayok|Nakhon Pathom|Nakhon Phanom|Nakhon Ratchasima|Nakhon Sawan|Nakhon Si Thammarat|Nan|Narathiwat|Nong Bua Lamphu|Nong Khai|Nonthaburi|Pathum Thani|Pattani|Phang Nga|Phatthalung|Phayao|Phetchabun|Phetchaburi|Phichit|Phitsanulok|Phrae|Phuket|Prachinburi|Prachuap Khiri Khan|Ranong|Ratchaburi|Rayong|Roi Et|Sa Kaeo|Sakon Nakhon|Samut Prakan|Samut Sakhon|Samut Songkhram|Sara Buri|Satun|Sing Buri|Sisaket|Songkhla|Sukhothai|Suphan Buri|Surat Thani|Surin|Tak|Trang|Trat|Ubon Ratchathani|Udon Thani|Uthai Thani|Uttaradit|Yala|Yasothon"; // 76 provinces and special administrative areas (https://en.wikipedia.org/wiki/Provinces_of_Thailand) +aStates["Timor-Leste"] = "|Aileu|Ainaro|Atauro|Baucau|Bobonaro|Covalima|Dili|Ermera|Lautem|Liquica|Manatuto|Manufahi|Oecusse|Viqueque"; // 14 administrative posts and municipalities (https://en.wikipedia.org/wiki/Administrative_divisions_of_Timor-Leste) +aStates["Togo"] = "|Centrale|Kara|Maritime|Plateaux|Savanes"; // 5 regions (https://en.wikipedia.org/wiki/Regions_of_Togo) +aStates["Tokelau"] = "|Atafu|Fakaofo|Nukunonu"; // 3 atolls (https://en.wikipedia.org/wiki/Administrative_divisions_of_Tokelau) +aStates["Tonga"] = "|Haʻapai|ʻEua|Niuas|Tongatapu|Vavaʻu"; // 5 administrative divisions (https://en.wikipedia.org/wiki/Administrative_divisions_of_Tonga) +aStates["Trinidad and Tobago"] = "|Arima|Chaguanas|Couva-Tabaquite-Talparo|Diego Martin|Mayaro-Rio Claro|Penal-Debe|Point Fortin|Port of Spain|Princes Town|Rio Claro-Mayaro|San Fernando|San Juan-Laventille|Sangre Grande|Siparia|Tunapuna-Piarco"; // 15 regional corporations and boroughs (https://en.wikipedia.org/wiki/Administrative_divisions_of_Trinidad_and_Tobago) +aStates["Tunisia"] = "|Ariana|Béja|Ben Arous|Bizerte|Gabès|Gafsa|Jendouba|Kairouan|Kasserine|Kebili|Kef|Mahdia|Manouba|Medenine|Monastir|Nabeul|Sfax|Sidi Bouzid|Siliana|Sousse|Tataouine|Tozeur|Tunis|Zaghouan"; // 24 governorates (https://en.wikipedia.org/wiki/Governorates_of_Tunisia) +aStates["Türkiye"] = "|Adana|Adıyaman|Afyonkarahisar|Ağrı|Aksaray|Amasya|Ankara|Antalya|Ardahan|Artvin|Aydın|Balıkesir|Bartın|Batman|Bayburt|Bilecik|Bingöl|Bitlis|Bolu|Burdur|Bursa|Çanakkale|Çankırı|Çorum|Denizli|Diyarbakır|Düzce|Edirne|Elazığ|Erzincan|Erzurum|Eskişehir|Gaziantep|Giresun|Gümüşhane|Hakkâri|Hatay|Iğdır|Isparta|İstanbul|İzmir|Kahramanmaraş|Karabük|Karaman|Kars|Kastamonu|Kayseri|Kilis|Kırıkkale|Kırklareli|Kırşehir|Kocaeli|Konya|Kütahya|Malatya|Manisa|Mardin|Mersin|Muğla|Muş|Nevşehir|Niğde|Ordu|Osmaniye|Rize|Sakarya|Samsun|Şanlıurfa|Siirt|Sinop|Sivas|Şırnak|Tekirdağ|Tokat|Trabzon|Tunceli|Uşak|Van|Yalova|Yozgat|Zonguldak"; // 81 provinces (https://en.wikipedia.org/wiki/Provinces_of_Turkey) +aStates["Turkmenistan"] = "|Ahal|Ashgabat|Balkan|Daşoguz|Lebap|Mary"; // 6 regions including the capital city (https://en.wikipedia.org/wiki/Administrative_divisions_of_Turkmenistan) +aStates["Turks and Caicos Islands"] = "|Grand Turk|Middle Caicos|North Caicos|Providenciales|Salt Cay|South Caicos"; // 6 main islands (https://en.wikipedia.org/wiki/Administrative_divisions_of_the_Turks_and_Caicos_Islands) +aStates["Tuvalu"] = "|Funafuti|Nanumaga|Nanumea|Niulakita|Niutao|Nui|Nukufetau|Nukulaelae|Vaitupu"; // 9 islands (https://en.wikipedia.org/wiki/Administrative_divisions_of_Tuvalu) +aStates["Uganda"] = "|Abim|Adjumani|Agago|Alebtong|Amolatar|Amudat|Amuria|Amuru|Apac|Arua|Budaka|Bududa|Bugiri|Bugweri|Buhweju|Buikwe|Bukedea|Bukomansimbi|Bukwo|Bukwo|Bulambuli|Buliisa|Bundibugyo|Bunyangabu|Bushenyi|Busia|Butaleja|Butambala|Butebo|Buvuma|Buyende|Dokolo|Gomba|Gulu|Hoima|Ibanda|Iganga|Isingiro|Jinja|Kaabong|Kabale|Kabarole|Kaberamaido|Kagadi|Kakumiro|Kalaki|Kalangala|Kaliro|Kalungu|Kampala|Kamuli|Kamwenge|Kanungu|Kapchorwa|Kapelebyong|Karenga|Kasanda|Kasese|Katakwi|Kayunga|Kazo|Kibaale|Kiboga|Kibuku|Kikuube|Kiruhura|Kiryandongo|Kisoro|Kitagwenda|Kitgum|Koboko|Kole|Kotido|Kumi|Kwania|Kween|Kyankwanzi|Kyegegwa|Kyenjojo|Kyotera|Lamwo|Lira|Luuka|Luwero|Lwengo|Lyantonde|Madi-Okollo|Manafwa|Maracha|Masaka|Masindi|Mayuge|Mbale|Mbarara|Mitooma|Mityana|Moroto|Moyo|Mpigi|Mubende|Mukono|Nabilatuk|Nakapiripirit|Nakaseke|Nakasongola|Namayingo|Namisindwa|Namutumba|Napak|Nebbi|Ngora|Ntoroko|Ntungamo|Nwoya|Obongi|Omoro|Otuke|Oyam|Pader|Pakwach|Pallisa|Rakai|Rubanda|Rubirizi|Rukiga|Rukungiri|Rwampara|Sembabule|Serere|Sheema|Sironko|Soroti|Terego|Tororo|Wakiso|Yumbe|Zombo"; // 135 districts (as of July 2020 structure, based on 2015 expansion) (https://en.wikipedia.org/wiki/Districts_of_Uganda) +aStates["Ukraine"] = "|Avtonomna Respublika Krym (Simferopol)|Cherkasy Oblast (Cherkasy)|Chernihiv Oblast (Chernihiv)|Chernivtsi Oblast (Chernivtsi)|Dnipropetrovsk Oblast (Dnipro)|Donetsk Oblast (Donetsk)|Ivano-Frankivsk Oblast (Ivano-Frankivsk)|Kharkiv Oblast (Kharkiv)|Kherson Oblast (Kherson)|Khmelnytskyi Oblast (Khmelnytskyi)|Kirovohrad Oblast (Kropyvnytskyi)|Kyiv|Kyiv Oblast (Kyiv)|Luhansk Oblast (Luhansk)|Lviv Oblast (Lviv)|Mykolaiv Oblast (Mykolaiv)|Odesa Oblast (Odesa)|Poltava Oblast (Poltava)|Rivne Oblast (Rivne)|Sevastopol|Sumy Oblast (Sumy)|Ternopil Oblast (Ternopil)|Vinnytsia Oblast (Vinnytsia)|Volyn Oblast (Lutsk)|Zakarpattia Oblast (Uzhhorod)|Zaporizhzhia Oblast (Zaporizhzhia)|Zhytomyr Oblast (Zhytomyr)" // 27 administrative divisions (24 oblasts + Crimea + Kyiv + Sevastopol, based on 2022 administrative changes) (https://en.wikipedia.org/wiki/Administrative_divisions_of_Ukraine) +aStates["United Arab Emirates"] = "|Abu Dhabi|Ajman|Dubai|Fujairah|Ras Al Khaimah|Sharjah|Umm Al Quwain"; // 7 emirates (https://en.wikipedia.org/wiki/Emirates_of_the_United_Arab_Emirates) +aStates["United Kingdom"] = "|Aberdeen City|Aberdeenshire|Anglesey|Angus|Argyll and Bute|Bedfordshire|Berkshire|Blaenau Gwent|Bridgend|Bristol|Buckinghamshire|Caerphilly|Cambridgeshire|Cardiff|Carmarthenshire|Ceredigion|Cheshire|Clackmannanshire|Conwy|Cornwall|County Antrim|County Armagh|County Down|County Fermanagh|County Londonderry|County Tyrone|Cumbria|Denbighshire|Derbyshire|Devon|Dorset|Dumfries and Galloway|Dundee|Durham|East Ayrshire|East Dunbartonshire|East Lothian|East Renfrewshire|East Riding of Yorkshire|East Sussex|Edinburgh|Essex|Falkirk|Fife|Flintshire|Glamorgan|Glasgow|Gloucestershire|Greater London|Greater Manchester|Gwynedd|Hampshire|Herefordshire|Hertfordshire|Highland|Inverclyde|Isle of Wight|Kent|Lancashire|Leicestershire|Lincolnshire|Merseyside|Merthyr Tydfil|Middlesex|Midlothian|Monmouthshire|Moray|Neath Port Talbot|Newport|Newport City|Norfolk|North Ayrshire|North Lanarkshire|North Yorkshire|Northamptonshire|Northumberland|Nottinghamshire|Orkney|Oxfordshire|Pembrokeshire|Perth and Kinross|Powys|Renfrewshire|Rhondda Cynon Taff|Rutland|Scottish Borders|Shetland Isles|Shropshire|Somerset|South Ayrshire|South Lanarkshire|South Yorkshire|Staffordshire|Stirlingshire|Suffolk|Surrey|Swansea|Torfaen|Tyne and Wear|Warwickshire|West Dunbartonshire|West Lothian|West Midlands|West Sussex|West Yorkshire|Western Isles|Wiltshire|Worcestershire|Wrexham"; // 109 administrative divisions (48 English counties, 6 Northern Irish counties, 32 Scottish council areas, 23 Welsh principal areas) (https://en.wikipedia.org/wiki/Administrative_geography_of_the_United_Kingdom) +aStates["United States Minor Outlying Islands"] = "|Baker Island|Howland Island|Jarvis Island|Johnston Atoll|Kingman Reef|Midway Atoll|Navassa Island|Palmyra Atoll|Wake Island"; // 9 islands and atolls (https://en.wikipedia.org/wiki/United_States_Minor_Outlying_Islands) +aStates["Uruguay"] = "|Artigas|Canelones|Cerro Largo|Colonia|Durazno|Flores|Florida|Lavalleja|Maldonado|Montevideo|Paysandu|Rio Negro|Rivera|Rocha|Salto|San Jose|Soriano|Tacuarembo|Treinta y Tres"; // 19 departments (https://en.wikipedia.org/wiki/Departments_of_Uruguay) +aStates["Uzbekistan"] = "|Andijon Wiloyati|Bukhoro Wiloyati|Farghona Wiloyati|Jizzakh Wiloyati|Khorazm Wiloyati (Urganch)|Namangan Wiloyati|Nawoiy Wiloyati|Qashqadaryo Wiloyati (Qarshi)|Qoraqalpoghiston (Nukus)|Samarqand Wiloyati|Sirdaryo Wiloyati (Guliston)|Surkhondaryo Wiloyati (Termiz)|Toshkent Shahri|Toshkent Wiloyati"; // 14 regions including autonomous republic and the capital city (https://en.wikipedia.org/wiki/Administrative_divisions_of_Uzbekistan) +aStates["Vanuatu"] = "|Malampa|Penama|Sanma|Shefa|Tafea|Torba"; // 6 provinces (https://en.wikipedia.org/wiki/Provinces_of_Vanuatu) +aStates["Venezuela"] = "|Amazonas|Anzoategui|Apure|Aragua|Barinas|Bolivar|Carabobo|Cojedes|Delta Amacuro|Dependencias Federales|Distrito Federal|Falcon|Guarico|Lara|Merida|Miranda|Monagas|Nueva Esparta|Portuguesa|Sucre|Tachira|Trujillo|Vargas|Yaracuy|Zulia"; // 25 divisions (23 states, 1 capital district, 1 federal dependencies; Vargas renamed La Guaira 2019) (https://en.wikipedia.org/wiki/States_of_Venezuela) +aStates["Vietnam"] = "|An Giang|Bắc Ninh|Cà Mau|Cần Thơ|Cao Bằng|Da Nang|Đắk Lắk|Điện Biên|Đồng Nai|Đồng Tháp|Gia Lai|Hà Tĩnh|Haiphong|Hanoi|Ho Chi Minh City|Huế|Hưng Yên|Khánh Hòa|Lai Châu|Lâm Đồng|Lạng Sơn|Lào Cai|Nghệ An|Ninh Bình|Phú Thọ|Quảng Ngãi|Quảng Ninh|Quảng Trị|Sơn La|Tây Ninh|Thái Nguyên|Thanh Hóa|Tuyên Quang|Vĩnh Long"; // 34 administrative divisions (28 provinces + 6 municipalities, based on 2025 governmental reforms) (https://en.wikipedia.org/wiki/Administrative_divisions_of_Vietnam) +aStates["Virgin Islands (British)"] = "|Anegada|Jost Van Dyke|Tortola|Virgin Gorda"; // 4 main islands (https://en.wikipedia.org/wiki/Administrative_divisions_of_the_British_Virgin_Islands) +aStates["Virgin Islands (U.S.)"] = "|Saint Croix|Saint John|Saint Thomas"; // 3 main islands (https://en.wikipedia.org/wiki/Administrative_divisions_of_the_United_States_Virgin_Islands) +aStates["Wallis and Futuna"] = "|Alo|Sigave|Uvea"; // 3 traditional kingdoms (https://en.wikipedia.org/wiki/Administrative_divisions_of_Wallis_and_Futuna) +aStates["Western Sahara"] = "|Aousserd|Boujdour|Dakhla|Es Semara|Laayoune|Oued ed Dahab"; // 6 provinces (https://en.wikipedia.org/wiki/Administrative_divisions_of_Western_Sahara) +aStates["Yemen"] = "|'Amran|Abyan|Aden|Al Bayda|Al Hudaydah|Al Jawf|Al Mahrah|Al Mahwit|Amanat Al Asimah|Dhale|Dhamar|Hadramaut|Hajjah|Ibb|Lahij|Ma'rib|Raymah|Sa'dah|Sana'a|Shabwah|Socotra|Taiz"; // 22 governorates (including 1 municipality) (https://en.wikipedia.org/wiki/Governorates_of_Yemen) +aStates["Zambia"] = "|Central|Copperbelt|Eastern|Luapula|Lusaka|Muchinga|North-Western|Northern|Southern|Western"; // 10 provinces (Muchinga created 2011) (https://en.wikipedia.org/wiki/Provinces_of_Zambia) +aStates["Zimbabwe"] = "|Bulawayo|Harare|Manicaland|Mashonaland Central|Mashonaland East|Mashonaland West|Masvingo|Matabeleland North|Matabeleland South|Midlands"; // 10 provinces (2 metropolitan provinces created 1997) (https://en.wikipedia.org/wiki/Provinces_of_Zimbabwe) /* * gArCountryInfo * (0) Country name @@ -289,9 +281,11 @@ aStates[253]="|Self Hosted|Private Server|Architects Of Sleep|Chaos Friends|DFRN * (2) Number of states * (3) Max state length */ -gLngNumberCountries = sCountryString.split("|").length; -//gArCountryInfo = new Array(gLngNumberCountries); -gArCountryInfo=sCountryString.split("|"); +// build the ordered country list from aStates keys +gCountryList = Object.keys(aStates); +gLngNumberCountries = gCountryList.length; +// initialize country info array (filled in Fill_Country) +gArCountryInfo = new Array(gLngNumberCountries); /* * gArStateInfo[country][statenames][namelengths] * (0) Country @@ -299,7 +293,7 @@ gArCountryInfo=sCountryString.split("|"); * (0) name * (1) nameLength */ -gArStateInfo = new Array(gLngNumberCountries); +gArStateInfo = new Array(gLngNumberCountries); /* * fInitgArStateInfo() @@ -311,28 +305,37 @@ gArStateInfo = new Array(gLngNumberCountries); * gArStateInfo[i][j]=state name, name length */ function fInitgArStateInfo() { - var i=0, j=0, sStateName="", iNumberOfStates=0; - var iMaxLength=0, iLength=0; - var oldNumber=0; - - for (i=0;i ').append($("#nav-notifications-mark-all").clone()).html()); //outerHtml hack var notifications_empty = unescape($("#nav-notifications-menu").html()); - + /* Ensure loading is visible when notifications menu is opened (if no notifications loaded yet)*/ $('#nav-notifications-linkmenu, #nav-notifications-menu-btn').on('click', function() { if ($("#nav-notifications-loading").length && $("#nav-notifications-empty").length) { // Only show loading if we haven't loaded notifications yet var menu = $("#nav-notifications-menu"); var hasNotifications = menu.find('.notif-item, li').not('#nav-notifications-loading, #nav-notifications-empty').length > 0; - var hasContent = menu.html().indexOf('nav-notifications-see-all') > -1; + var hasContent = menu.html().indexOf('nav-notifications-see-all') > -1; if (!hasNotifications && !hasContent) { $("#nav-notifications-loading").show(); $("#nav-notifications-empty").hide(); @@ -319,7 +319,7 @@ $(function() { // Hide loading state when we receive notification data $("#nav-notifications-loading").hide(); - + if (data.notifications.length == 0) { $("#nav-notifications-empty").show(); } else { @@ -328,9 +328,9 @@ $(function() { // Preserve the loading and empty state elements when rebuilding the menu var loadingElement = nnm.find("#nav-notifications-loading"); var emptyElement = nnm.find("#nav-notifications-empty"); - + nnm.html(notifications_all + notifications_mark); - + // Re-add the loading and empty elements if they existed if (loadingElement.length > 0) { nnm.append(loadingElement); @@ -754,6 +754,15 @@ function doFollowThread(ident) { update_item = ident.toString(); } +function doCompleteThread(ident) { + unpause(); + $('#like-rotator-' + ident.toString()).show(); + $.post('item/' + ident.toString() + '/complete', NavUpdate); + liking = 1; + force_update = true; + update_item = ident.toString(); +} + function doStar(ident) { ident = ident.toString(); $('#like-rotator-' + ident).show(); @@ -1113,9 +1122,15 @@ Array.prototype.remove = function(item) { function previewTheme(elm) { theme = $(elm).val(); $.getJSON('pretheme?theme=' + theme,function(data) { - $('#theme-preview').html('' + data.desc + '' + data.version + '' + data.credits + ''); + $('#theme-preview').html(` +
${data.desc}+${data.credits}+ ++ +
${data.version}+ `); }); - } // notification permission settings in localstorage diff --git a/view/js/videojs/video-js.min.css b/view/js/videojs/video-js.min.css new file mode 100644 index 0000000000..3194559e10 --- /dev/null +++ b/view/js/videojs/video-js.min.css @@ -0,0 +1 @@ +.vjs-svg-icon{display:inline-block;background-repeat:no-repeat;background-position:center;fill:currentColor;height:1.8em;width:1.8em}.vjs-svg-icon:before{content:none!important}.vjs-control:focus .vjs-svg-icon,.vjs-svg-icon:hover{filter:drop-shadow(0 0 .25em #fff)}.video-js .vjs-big-play-button .vjs-icon-placeholder:before,.video-js .vjs-modal-dialog,.vjs-button>.vjs-icon-placeholder:before,.vjs-modal-dialog .vjs-modal-dialog-content{position:absolute;top:0;left:0;width:100%;height:100%}.video-js .vjs-big-play-button .vjs-icon-placeholder:before,.vjs-button>.vjs-icon-placeholder:before{text-align:center}@font-face{font-family:VideoJS;src:url(data:application/font-woff;charset=utf-8;base64,d09GRgABAAAAABTsAAsAAAAAIpAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABHU1VCAAABCAAAADsAAABUIIslek9TLzIAAAFEAAAAPgAAAFZRiV32Y21hcAAAAYQAAAEJAAAD5p42+VxnbHlmAAACkAAADtIAABckI4l972hlYWQAABFkAAAAKwAAADYsvIjpaGhlYQAAEZAAAAAdAAAAJA+RCL1obXR4AAARsAAAABcAAAC8Q2YAAGxvY2EAABHIAAAAYAAAAGB7CIGGbWF4cAAAEigAAAAfAAAAIAFAAI9uYW1lAAASSAAAASUAAAIK1cf1oHBvc3QAABNwAAABfAAAAnXdFqh1eJxjYGRgYOBiMGCwY2BycfMJYeDLSSzJY5BiYGGAAJA8MpsxJzM9kYEDxgPKsYBpDiBmg4gCACY7BUgAeJxjYGR7yDiBgZWBgaWQ5RkDA8MvCM0cwxDOeI6BgYmBlZkBKwhIc01hcPjI+FGPHcRdyA4RZgQRADaGCyYAAHic7dPXbcMwAEXRK1vuvffem749XAbKV3bjBA6fXsaIgMMLEWoQJaAEFKNnlELyQ4K27zib5PNF6vl8yld+TKr5kH0+cUw0xv00Hwvx2DResUyFKrV4XoMmLdp06NKjz4AhI8ZMmDJjzoIlK9Zs2LJjz4EjJ85cuHLjziPe/0UWL17mf2tqKLz/9jK9f8tXpGCoRdPKhtS0RqFkWvVQNtSKoVYNtWaoddPXEBqG2jQ9XWgZattQO4baNdSeofYNdWCoQ0MdGerYUCeGOjXUmaHODXVhqEtDXRnq2lA3hro11J2h7g31YKhHQz0Z6tlQL4Z6NdSbod4N9WGoT9MfHF6GmhnZLxyDcRMAAAB4nJ1YC1hU17U+a5/HMA4iA3NmVBDmoQwP5TFnHlFeA4gYiUFRQINoSCBAyK3G2yi+0aipYtFcHYo2xsb4NiY3+VrNxSaX5uvt495ozNdoYoxmem2/L8HGpLc+InB279pnhlGr5mvL4eyz99nrrL32eu1/DQcc/okdYgdHOA6MQKp4r9gx0EcMHMezOalVasW5BM7NcXoSb9fFgE6KtSSBxWz1FYDPG+vMBGcKb9cebu2VS5s2aaTkCvRSf6C7Y+Ppibm5E09v7IDs2/3uZQtbD0zIyppwoHXh/93ukmyYgdePNRp65p5v+3v/9otQl2O7wP34cT88p8Md2YxpYLQZoRcy6FlSBRnwnGAe6BPMSCZo+7NJVqS0cE4uHendzhSnbPH6TDqL1+Nme5LZXkCHnGyoH0kne30WH+gswhm3q+pt/mTas9NLS64GnjmSlTPw0wVQT/ewRaBgxtydy3cuUB9/6SW+vb5yRvr+t0eOfPKJZ/9t3+4tL7xj32Xd3thCxi+ge6ifdsAN+l5+wi5HQ/cCoeull1AszS7CUfEcJzK7sKWJAdJhCd0sPM4+EY7QDm5ov08hXRQXE5bf6PV5Q5+IjW7X7Nku92Ask4l2hCRRD6TPqISiCJeQna3SCFwrhrNzXHzo4yFevBwxpzxk8WCIIfkvVEKVy32SbT8n68gzgaslpaiO2zIGIyuSb7RNf9HSuN26y/7OC1tgEmpiyA6aD4qcgTOiLThwGG0eB694FI8NHLLN6OBlRVaMxNAFS4JdXUG6mW8PwpKuYLCLXKGbu8iwYNdgO06Sn3Th+/vyZAxs8Ro30DjHe9gy8Fywi24OMm7Qyzh3MTZVOMYhLBnoC+J79lpTUyQmorjhnMwlcQ5uPEYGpDjsOkkH49BjQLQBqs3jFtFdJNlksYmoQFDArLh8Xh+Qd6Ghcsb6FUuehDi+U/lqD71K/qiegeV1imcwjl7ExwiSrf4BZyCujV6cVcFo6VX+G9IcPyFjJnUufbU/jzrL1X99as36reXl8K32nFaOr+E8jWJEcJ55DpMVfSMe95/AJaOsGBH2GJCNpiRQbK4C8BjdmQA22QY2j03Em13i2YHqtNLU1NI04Yj2HJgA6fQc6VPNpA/D+Ryks554NnVy2mB72uRUfPLsqR4N0LOBQKArwJYO+5W2fgZX8oC1HR6HjNaQTVIG2FPwnTcXXGZZfNB7TE6pTKZUwaw91XWLAoFFGcnB5PHjsckgBjbWutrL+0h5Y1xw3DRGDumsnXb3MJwXrJIN5U7m0rgJ3yG5w4he5ckFG4pmNEkOm0/xOO4r4yL87wqtQM+hiJIVp+6iG2wPBKD35ElGkDx+UfC2v1mFG1o+M3AjNFty8biKMXwzyxnZLds8wYD2BxmCPHAldPOeLsy/0BugftYhVYFAhO8SqQ0j3oK7dHJZnI/jxmUS4onlxskSF8thmvNZjIrRZwEPxr0lBuLRuz3oy/FOHCsxwOPYh2M+e9u3J5pgPYz9gp6G7C9m0A11F9ddqKMfV+4sbq45/YspOysXvT+3pdFdYNg2fHbW8Dz301MqDVuGrz0Fuh0YMW8mddrpqzST7rV9BcvqPoNvadRndWp0p8HvbiqrFj5yFQ/vNFSXDpxpLEFWp+DcrF3FT1afWshFcmCfeAMjEvO65i0Y6XijQfSRPWx3TV/Df7Km3E1l+kLt56s/rwVzuRusNMhudznkwdLaS+QNdeal2jDPP4l9qHc98vTYZOSkxzD+njBWVWjFPKgipx6DkWvXQiW8OYcewVHE5yukinDMcfGgc0opDltYKDxIGBedkzc6jSfE7tlvESCDFUw0Hx0opS+U0lHCxNottbNWSxX9zZVvEhKWUSyBpaXwBc2a98M6UqPeXAs/GDon8Ax7hsthO8cM5HU7Ad0UvRR9lHmtyQKZ4MAe814X5h9MSUkQmhf96eVJ6p90OjIiqSIjvykvr2l5U55O/fPQKD+jIomYpNyGJQ25uQ2kIikRfAmuBHCPsWqkSDEqgZ5KDI2sifS/R43MbZg0idFHbCPNxXxZws1ACVE6hAhOdJwRkJLFBLPZpRGYJ50pko6XzMkgmSx40ljik6AQcKhFnLcQE6rF7PXFe1Ocoj0T3AXgSgJTDIhHRfHlYZKuSzc6uievOJGXY+i5GJkkTp7UM3y0LqATDbtFcbdBxO7o4T25JYlEjoH0uynUh8rapkxp62QN70svSF+hT4gGPlovlmcm/ComLi7mV4kTykV9NFWjE/QrwgQ4uIcAP0rQF4VZYRP2o3PhHHzfPMJj9Ir+uzKUlrH49ntT18AVvj1sc3YGjUT/Mt2Dxawa8ArcA7bCQIpvfwAYu22vEG/No/5RvPdA7g+AelLrPwzy+LtkLPhnpIxH14m4EYq8eeMHbPEPNm6G7Nv9B4jcFPZ8bJj0SEjP3MPgQdKTqqEoy2v6G32P/Y6dxOv04AxnoAeq+GILvUavtYCBXm+BaIhuodcfrN5B/V2EYMCPh+SxavjGyPwV0x4CJgUPGT0mQaODGBACIJZGsMXwAD0LGXx7l3CdAcKMIKI+f5CepWeD0BvyU/GcdBxPF8SwejC6LGZmAURFdsSWKR5HyHld2kbdIZO1Ixx+bnnzU7n5+blPNV9jnUDWhP2tC68tbN3PVIldsQPxSAcSpjOav7Q05uXn5zW2LLvDXn9B6syscPy9iDLEMmSrJz6nYuWMipukjM0AH8JkGS+XFyMRkzSCH7KD/hwm172SAyZYumHlefr5AddrtA0O0TnwaVZxcRY9Bfukn9Gf05N1r9DV9MoBsJ1f+ZrqUvtPHizJAntWybv7hmqLt6QLuK6ZS9Fqi1jO5rDoWPZXXII5Tgajg53cIXCjDCGIcYrRIY2n6+mXOa/W0bdhau3ryiEYe2FV/5oeaIYK/5w5frCyll6/cYO8DiNhw6t1MBWmznt91QX62UF1N7l0eHBZTRGpKaqpKVIPF9UcIzmReud9TSY75+K899GHbBu6wjoR7RKKZVYiYxSPf5/2wJT5e3NAhmUbVn5KLx1Ujg0+BGvpAIh0DezInTkzF37KVocxrKU3r1+XLtAe2lO3l66kfQfB/unKY+q8N375Ru8bc4pJXfEcESU95q+p8ZNZRTWH1d9FzvUdYXk5rLkcdkEisoKKVHQW/b3GEx6tPaYcoJfOr9wAbSBnv1IHpep0OExr4LPMkpJM+j7sly7UHkOzXjoAZljHCGiyegtNlwljM0v+c19ET9Pvst09a2Mtgcf5/ZSzYO5h1156+eyydfAsxGa9XAuF6vzjh6CssLq6ECysperXX0sX5h5ZdpZe3guxsGIPEtHk/aqXX1hVqP5HYVVVISkrrNqvXorIc+5Ou91Hnr/LcD2afi6eX7UBloOcs7cOpqgGaNfs1g7bNbs9z6wASaylN69d0/TFTIz6Ws8+oGV3mE2612wRTHKcVUbhjKadebloMc+dyXgMVtVK6BwMB/+mVW09igdRBWaRtNQX59d/VD//xdQ0TCiYNj1KT9sq6Wdu5WTbqk3qDXyDaLa1fv621LS01G3z61sD6lH8lAxDLicV921s6Bf92JOYvzNYCL1khbqBXEFUzC521N5NyzNaQIWhjyFyDoBIVrAjmv2UEaLlI+c6zw1jmVIPLLLZZUTj6GxGHW+mq1tgHXR2D85p4Q934+jLbtjVLcyCdS10NVzpHqxp4Q/hK7WopY/NRGx9HGsPGdFjOjcpjBnGYMVqY/4eqT5khWEHWUup2A/pTw7pdWgsWft7ETUERL96nRg0HNFPmCYba6pylECaExX89A9WLUOVB4oKLu/o1oqSYHCgLzBUlAz8hNFDRpeSU1XT+LRmDUgPaKbYdHDn9suF/tu13nHJij0N97LfS0QmqONuyONk7zvUI6Qa0pF9f2+oABL92AT6e0U//z9YqAiWtJLU1JK0gS+1aacwamiNqK067u9ZQ8f1d4qLodMzz3uL89Z68V/Hnr++hXWUuHgw8dfi972PeTyPefu3aNNucemQ74qFuIaJnVkOu4Q+yjuwmmC1FqZpl1i4uzoPxjkpPf3Xv545tl26Rr+dOvUd+omqJzch9dOeU7f10Y64nMcKK137DccIZq2WdXtdZjbEoLSzHwiMtrjYLDxpHQW8gjMX6XFYAE2zSWVD04EGYSs9MbO6sEo20BMEAB4mpvSypsKjZ4Stgzb+c3A9/MQT2+vrBy+qvyFxLUtLlSRF/Ri2wjfZ2dus2Q8lXx4608/jnqK5OOap6NY2PSjYYnECCjiEeLJll/pbmqfeIK+ps3+MxrlEhqmTPipVP7kqlF4VhpEb6r+Q7YOJg38kJ9SHBf3NBl6+9YchfbUjb5ahLSzUM3kPHmwFAsZ5rpai0S7E5xWzZ1j+fW7zsUWP2g5NXTw52ySCTrgG0+lbw60l2Y/CB185CoA8NK+tbRKxfjy6pm5hzQRRR+cMqv1Jbiw6STivtEvt3DRcy0QEh92JlUGo2PG4tSKHl00YD6xc8CK+YPYyy3io2lN8BcSjKRzrIV6ypOAobqxViJPaT9M9Hy5szY33mp7OX/Zu89L/7Ww5vqY2Y8b0pKgoiUhG5cPDPzq8qTV/WkzUOIvXVVA96kmjcBrr3HrYC/Wn+fYP6Z7T1rqy3zknbvqma/FvVk96fNXGkuaXrdHW5JGSxZT/2I/O73v+yNWafMdzc5NdxYurHs6h86e01sLKLz9EBrg+x36rxAaED7hRnAMx7Vzu+9wabh3zG8XLQjx0ablUJzmxdErxYT3kzQSd0SSafVqF5PXgpp0OyYJ1EyNHpGUZmvK575ySzd85JSqF7IBzSAbMM04+MbE58xF3/njXOGecSaermlw2y9PsSQdytLJVr8t+wg+rR8cZYoeNxVIzNdk3Bngi8U5LAlgTFoQnzJCa5EsCgYhCaGL+qPj7TdhG31p9tej3R04N//PXxNwJvyUqwaJqRPJY98TJ5TPndmflRAkAhBfe46sfKW5wizSge08Xb7Ca/GUVs55trngkKkrUS2WPzKttaaqq+idmahugkY+W6fN0I6i3gPt/x88U4wAAeJxjYGRgYADiGU9YXsXz23xl4GZnAIFH7fO+IdMc/WBxDgYmEAUASbMKwAB4nGNgZGBgZwABjj4Ghv//OfoZGBlQgT4ARicDZAAAAHicY2BgYGAfxJijD8Fmu4EqBwCSpgKpAAAAAAAADgBoAH4AzADgAQIBQgFsAZgB7gIuAooC0AL8A2IDjAOoA+AEMASwBNoFCAVaBcAGCAYuBnAGrAb2B04HigfSCCoIcAiGCJwIyAkkCVYJiAmsCfIKIApWCsQLknicY2BkYGDQZ2hmYGcAASYg5gJCBob/YD4DABqrAdAAeJxdkE1qg0AYhl8Tk9AIoVDaVSmzahcF87PMARLIMoFAl0ZHY1BHdBJIT9AT9AQ9RQ9Qeqy+yteNMzDzfM+88w0K4BY/cNAMB6N2bUaPPBLukybCLvleeAAPj8JD+hfhMV7hC3u4wxs7OO4NzQSZcI/8Ltwnfwi75E/hAR7wJTyk/xYeY49fYQ/PztM+jbTZ7LY6OWdBJdX/pqs6NYWa+zMxa13oKrA6Uoerqi/JwtpYxZXJ1coUVmeZUWVlTjq0/tHacjmdxuL90OR8O0UEDYMNdtiSEpz5XQGqzlm30kzUdAYFFOb8R7NOZk0q2lwAyz1i7oAr1xoXvrOgtYhZx8wY5KRV269JZ5yGpmzPTjQhvY9je6vEElPOuJP3mWKnP5M3V+YAAAB4nG2ReVPbMBDF/ULi2EkDBFqO3gdHLxUzDB9IkdexBllydRD49ihO3Ckz7B/a31utZnafkkGyiXnyclxhgB0MMUKKMTLkmGCKV5hhF3vYxxwHOMRrvMERjnGCU7zFO7zHB3zEJ3zGF3zFN5zhHBe4xHf8wE/8wm8w/MEVimTYKv44XR9MSCsUjVoeHE3vjQoNsSZ4mmxZmVWPjSz7jlou6/0qKOWEJdKMtCe793/hQfqxa6XWZHMXFl56RS4TvPXSaDeoy0zUUZB109KstDK8lHo5q6Qi1hcOnqkImubPS6aqRq7mlnaEWabub4iYblba3SRmgldS0+FWdhNtt04F14JUaqkl7tcpOpJtErvNt3Bd9HRT5JWxK25Ldjvp6br4hzfFiIdSmlzTg2fSUzNrLd1LE1ynxq4OVaVoKLjzJ60UPtj1RKzHzsbjly6inVnFBS2MucviPncU7Rr7lfTxRepDs1A2j3ZHRc7PuzFYSfE3ZOd4kjwBy227hA==) format("woff");font-weight:400;font-style:normal}.video-js .vjs-big-play-button .vjs-icon-placeholder:before,.video-js .vjs-play-control .vjs-icon-placeholder,.vjs-icon-play{font-family:VideoJS;font-weight:400;font-style:normal}.video-js .vjs-big-play-button .vjs-icon-placeholder:before,.video-js .vjs-play-control .vjs-icon-placeholder:before,.vjs-icon-play:before{content:"\f101"}.vjs-icon-play-circle{font-family:VideoJS;font-weight:400;font-style:normal}.vjs-icon-play-circle:before{content:"\f102"}.video-js .vjs-play-control.vjs-playing .vjs-icon-placeholder,.vjs-icon-pause{font-family:VideoJS;font-weight:400;font-style:normal}.video-js .vjs-play-control.vjs-playing .vjs-icon-placeholder:before,.vjs-icon-pause:before{content:"\f103"}.video-js .vjs-mute-control.vjs-vol-0 .vjs-icon-placeholder,.vjs-icon-volume-mute{font-family:VideoJS;font-weight:400;font-style:normal}.video-js .vjs-mute-control.vjs-vol-0 .vjs-icon-placeholder:before,.vjs-icon-volume-mute:before{content:"\f104"}.video-js .vjs-mute-control.vjs-vol-1 .vjs-icon-placeholder,.vjs-icon-volume-low{font-family:VideoJS;font-weight:400;font-style:normal}.video-js .vjs-mute-control.vjs-vol-1 .vjs-icon-placeholder:before,.vjs-icon-volume-low:before{content:"\f105"}.video-js .vjs-mute-control.vjs-vol-2 .vjs-icon-placeholder,.vjs-icon-volume-mid{font-family:VideoJS;font-weight:400;font-style:normal}.video-js .vjs-mute-control.vjs-vol-2 .vjs-icon-placeholder:before,.vjs-icon-volume-mid:before{content:"\f106"}.video-js .vjs-mute-control .vjs-icon-placeholder,.vjs-icon-volume-high{font-family:VideoJS;font-weight:400;font-style:normal}.video-js .vjs-mute-control .vjs-icon-placeholder:before,.vjs-icon-volume-high:before{content:"\f107"}.video-js .vjs-fullscreen-control .vjs-icon-placeholder,.vjs-icon-fullscreen-enter{font-family:VideoJS;font-weight:400;font-style:normal}.video-js .vjs-fullscreen-control .vjs-icon-placeholder:before,.vjs-icon-fullscreen-enter:before{content:"\f108"}.video-js.vjs-fullscreen .vjs-fullscreen-control .vjs-icon-placeholder,.vjs-icon-fullscreen-exit{font-family:VideoJS;font-weight:400;font-style:normal}.video-js.vjs-fullscreen .vjs-fullscreen-control .vjs-icon-placeholder:before,.vjs-icon-fullscreen-exit:before{content:"\f109"}.vjs-icon-spinner{font-family:VideoJS;font-weight:400;font-style:normal}.vjs-icon-spinner:before{content:"\f10a"}.video-js .vjs-subs-caps-button .vjs-icon-placeholder,.video-js .vjs-subtitles-button .vjs-icon-placeholder,.video-js.video-js:lang(en-AU) .vjs-subs-caps-button .vjs-icon-placeholder,.video-js.video-js:lang(en-GB) .vjs-subs-caps-button .vjs-icon-placeholder,.video-js.video-js:lang(en-IE) .vjs-subs-caps-button .vjs-icon-placeholder,.video-js.video-js:lang(en-NZ) .vjs-subs-caps-button .vjs-icon-placeholder,.vjs-icon-subtitles{font-family:VideoJS;font-weight:400;font-style:normal}.video-js .vjs-subs-caps-button .vjs-icon-placeholder:before,.video-js .vjs-subtitles-button .vjs-icon-placeholder:before,.video-js.video-js:lang(en-AU) .vjs-subs-caps-button .vjs-icon-placeholder:before,.video-js.video-js:lang(en-GB) .vjs-subs-caps-button .vjs-icon-placeholder:before,.video-js.video-js:lang(en-IE) .vjs-subs-caps-button .vjs-icon-placeholder:before,.video-js.video-js:lang(en-NZ) .vjs-subs-caps-button .vjs-icon-placeholder:before,.vjs-icon-subtitles:before{content:"\f10b"}.video-js .vjs-captions-button .vjs-icon-placeholder,.video-js:lang(en) .vjs-subs-caps-button .vjs-icon-placeholder,.video-js:lang(fr-CA) .vjs-subs-caps-button .vjs-icon-placeholder,.vjs-icon-captions{font-family:VideoJS;font-weight:400;font-style:normal}.video-js .vjs-captions-button .vjs-icon-placeholder:before,.video-js:lang(en) .vjs-subs-caps-button .vjs-icon-placeholder:before,.video-js:lang(fr-CA) .vjs-subs-caps-button .vjs-icon-placeholder:before,.vjs-icon-captions:before{content:"\f10c"}.vjs-icon-hd{font-family:VideoJS;font-weight:400;font-style:normal}.vjs-icon-hd:before{content:"\f10d"}.video-js .vjs-chapters-button .vjs-icon-placeholder,.vjs-icon-chapters{font-family:VideoJS;font-weight:400;font-style:normal}.video-js .vjs-chapters-button .vjs-icon-placeholder:before,.vjs-icon-chapters:before{content:"\f10e"}.vjs-icon-downloading{font-family:VideoJS;font-weight:400;font-style:normal}.vjs-icon-downloading:before{content:"\f10f"}.vjs-icon-file-download{font-family:VideoJS;font-weight:400;font-style:normal}.vjs-icon-file-download:before{content:"\f110"}.vjs-icon-file-download-done{font-family:VideoJS;font-weight:400;font-style:normal}.vjs-icon-file-download-done:before{content:"\f111"}.vjs-icon-file-download-off{font-family:VideoJS;font-weight:400;font-style:normal}.vjs-icon-file-download-off:before{content:"\f112"}.vjs-icon-share{font-family:VideoJS;font-weight:400;font-style:normal}.vjs-icon-share:before{content:"\f113"}.vjs-icon-cog{font-family:VideoJS;font-weight:400;font-style:normal}.vjs-icon-cog:before{content:"\f114"}.vjs-icon-square{font-family:VideoJS;font-weight:400;font-style:normal}.vjs-icon-square:before{content:"\f115"}.video-js .vjs-play-progress,.video-js .vjs-volume-level,.vjs-icon-circle,.vjs-seek-to-live-control .vjs-icon-placeholder{font-family:VideoJS;font-weight:400;font-style:normal}.video-js .vjs-play-progress:before,.video-js .vjs-volume-level:before,.vjs-icon-circle:before,.vjs-seek-to-live-control .vjs-icon-placeholder:before{content:"\f116"}.vjs-icon-circle-outline{font-family:VideoJS;font-weight:400;font-style:normal}.vjs-icon-circle-outline:before{content:"\f117"}.vjs-icon-circle-inner-circle{font-family:VideoJS;font-weight:400;font-style:normal}.vjs-icon-circle-inner-circle:before{content:"\f118"}.video-js .vjs-control.vjs-close-button .vjs-icon-placeholder,.vjs-icon-cancel{font-family:VideoJS;font-weight:400;font-style:normal}.video-js .vjs-control.vjs-close-button .vjs-icon-placeholder:before,.vjs-icon-cancel:before{content:"\f119"}.vjs-icon-repeat{font-family:VideoJS;font-weight:400;font-style:normal}.vjs-icon-repeat:before{content:"\f11a"}.video-js .vjs-play-control.vjs-ended .vjs-icon-placeholder,.vjs-icon-replay{font-family:VideoJS;font-weight:400;font-style:normal}.video-js .vjs-play-control.vjs-ended .vjs-icon-placeholder:before,.vjs-icon-replay:before{content:"\f11b"}.video-js .vjs-skip-backward-5 .vjs-icon-placeholder,.vjs-icon-replay-5{font-family:VideoJS;font-weight:400;font-style:normal}.video-js .vjs-skip-backward-5 .vjs-icon-placeholder:before,.vjs-icon-replay-5:before{content:"\f11c"}.video-js .vjs-skip-backward-10 .vjs-icon-placeholder,.vjs-icon-replay-10{font-family:VideoJS;font-weight:400;font-style:normal}.video-js .vjs-skip-backward-10 .vjs-icon-placeholder:before,.vjs-icon-replay-10:before{content:"\f11d"}.video-js .vjs-skip-backward-30 .vjs-icon-placeholder,.vjs-icon-replay-30{font-family:VideoJS;font-weight:400;font-style:normal}.video-js .vjs-skip-backward-30 .vjs-icon-placeholder:before,.vjs-icon-replay-30:before{content:"\f11e"}.video-js .vjs-skip-forward-5 .vjs-icon-placeholder,.vjs-icon-forward-5{font-family:VideoJS;font-weight:400;font-style:normal}.video-js .vjs-skip-forward-5 .vjs-icon-placeholder:before,.vjs-icon-forward-5:before{content:"\f11f"}.video-js .vjs-skip-forward-10 .vjs-icon-placeholder,.vjs-icon-forward-10{font-family:VideoJS;font-weight:400;font-style:normal}.video-js .vjs-skip-forward-10 .vjs-icon-placeholder:before,.vjs-icon-forward-10:before{content:"\f120"}.video-js .vjs-skip-forward-30 .vjs-icon-placeholder,.vjs-icon-forward-30{font-family:VideoJS;font-weight:400;font-style:normal}.video-js .vjs-skip-forward-30 .vjs-icon-placeholder:before,.vjs-icon-forward-30:before{content:"\f121"}.video-js .vjs-audio-button .vjs-icon-placeholder,.vjs-icon-audio{font-family:VideoJS;font-weight:400;font-style:normal}.video-js .vjs-audio-button .vjs-icon-placeholder:before,.vjs-icon-audio:before{content:"\f122"}.vjs-icon-next-item{font-family:VideoJS;font-weight:400;font-style:normal}.vjs-icon-next-item:before{content:"\f123"}.vjs-icon-previous-item{font-family:VideoJS;font-weight:400;font-style:normal}.vjs-icon-previous-item:before{content:"\f124"}.vjs-icon-shuffle{font-family:VideoJS;font-weight:400;font-style:normal}.vjs-icon-shuffle:before{content:"\f125"}.vjs-icon-cast{font-family:VideoJS;font-weight:400;font-style:normal}.vjs-icon-cast:before{content:"\f126"}.video-js .vjs-picture-in-picture-control .vjs-icon-placeholder,.vjs-icon-picture-in-picture-enter{font-family:VideoJS;font-weight:400;font-style:normal}.video-js .vjs-picture-in-picture-control .vjs-icon-placeholder:before,.vjs-icon-picture-in-picture-enter:before{content:"\f127"}.video-js.vjs-picture-in-picture .vjs-picture-in-picture-control .vjs-icon-placeholder,.vjs-icon-picture-in-picture-exit{font-family:VideoJS;font-weight:400;font-style:normal}.video-js.vjs-picture-in-picture .vjs-picture-in-picture-control .vjs-icon-placeholder:before,.vjs-icon-picture-in-picture-exit:before{content:"\f128"}.vjs-icon-facebook{font-family:VideoJS;font-weight:400;font-style:normal}.vjs-icon-facebook:before{content:"\f129"}.vjs-icon-linkedin{font-family:VideoJS;font-weight:400;font-style:normal}.vjs-icon-linkedin:before{content:"\f12a"}.vjs-icon-twitter{font-family:VideoJS;font-weight:400;font-style:normal}.vjs-icon-twitter:before{content:"\f12b"}.vjs-icon-tumblr{font-family:VideoJS;font-weight:400;font-style:normal}.vjs-icon-tumblr:before{content:"\f12c"}.vjs-icon-pinterest{font-family:VideoJS;font-weight:400;font-style:normal}.vjs-icon-pinterest:before{content:"\f12d"}.video-js .vjs-descriptions-button .vjs-icon-placeholder,.vjs-icon-audio-description{font-family:VideoJS;font-weight:400;font-style:normal}.video-js .vjs-descriptions-button .vjs-icon-placeholder:before,.vjs-icon-audio-description:before{content:"\f12e"}.video-js{display:inline-block;vertical-align:top;box-sizing:border-box;color:#fff;background-color:#000;position:relative;padding:0;font-size:10px;line-height:1;font-weight:400;font-style:normal;font-family:Arial,Helvetica,sans-serif;word-break:initial}.video-js:-moz-full-screen{position:absolute}.video-js:-webkit-full-screen{width:100%!important;height:100%!important}.video-js[tabindex="-1"]{outline:0}.video-js *,.video-js :after,.video-js :before{box-sizing:inherit}.video-js ul{font-family:inherit;font-size:inherit;line-height:inherit;list-style-position:outside;margin-left:0;margin-right:0;margin-top:0;margin-bottom:0}.video-js.vjs-1-1,.video-js.vjs-16-9,.video-js.vjs-4-3,.video-js.vjs-9-16,.video-js.vjs-fluid{width:100%;max-width:100%}.video-js.vjs-1-1:not(.vjs-audio-only-mode),.video-js.vjs-16-9:not(.vjs-audio-only-mode),.video-js.vjs-4-3:not(.vjs-audio-only-mode),.video-js.vjs-9-16:not(.vjs-audio-only-mode),.video-js.vjs-fluid:not(.vjs-audio-only-mode){height:0}.video-js.vjs-16-9:not(.vjs-audio-only-mode){padding-top:56.25%}.video-js.vjs-4-3:not(.vjs-audio-only-mode){padding-top:75%}.video-js.vjs-9-16:not(.vjs-audio-only-mode){padding-top:177.7777777778%}.video-js.vjs-1-1:not(.vjs-audio-only-mode){padding-top:100%}.video-js.vjs-fill:not(.vjs-audio-only-mode){width:100%;height:100%}.video-js .vjs-tech{position:absolute;top:0;left:0;width:100%;height:100%}.video-js.vjs-audio-only-mode .vjs-tech{display:none}body.vjs-full-window,body.vjs-pip-window{padding:0;margin:0;height:100%}.vjs-full-window .video-js.vjs-fullscreen,body.vjs-pip-window .video-js{position:fixed;overflow:hidden;z-index:1000;left:0;top:0;bottom:0;right:0}.video-js.vjs-fullscreen:not(.vjs-ios-native-fs),body.vjs-pip-window .video-js{width:100%!important;height:100%!important;padding-top:0!important;display:block}.video-js.vjs-fullscreen.vjs-user-inactive{cursor:none}.vjs-pip-container .vjs-pip-text{position:absolute;bottom:10%;font-size:2em;background-color:rgba(0,0,0,.7);padding:.5em;text-align:center;width:100%}.vjs-layout-small.vjs-pip-container .vjs-pip-text,.vjs-layout-tiny.vjs-pip-container .vjs-pip-text,.vjs-layout-x-small.vjs-pip-container .vjs-pip-text{bottom:0;font-size:1.4em}.vjs-hidden{display:none!important}.vjs-disabled{opacity:.5;cursor:default}.video-js .vjs-offscreen{height:1px;left:-9999px;position:absolute;top:0;width:1px}.vjs-lock-showing{display:block!important;opacity:1!important;visibility:visible!important}.vjs-no-js{padding:20px;color:#fff;background-color:#000;font-size:18px;font-family:Arial,Helvetica,sans-serif;text-align:center;width:300px;height:150px;margin:0 auto}.vjs-no-js a,.vjs-no-js a:visited{color:#66a8cc}.video-js .vjs-big-play-button{font-size:3em;line-height:1.5em;height:1.63332em;width:3em;display:block;position:absolute;top:50%;left:50%;padding:0;margin-top:-.81666em;margin-left:-1.5em;cursor:pointer;opacity:1;border:.06666em solid #fff;background-color:#2b333f;background-color:rgba(43,51,63,.7);border-radius:.3em;transition:all .4s}.vjs-big-play-button .vjs-svg-icon{width:1em;height:1em;position:absolute;top:50%;left:50%;line-height:1;transform:translate(-50%,-50%)}.video-js .vjs-big-play-button:focus,.video-js:hover .vjs-big-play-button{border-color:#fff;background-color:rgb(114.9141509434,132.7028301887,159.3858490566);background-color:rgba(114.9141509434,132.7028301887,159.3858490566,.5);transition:all 0s}.vjs-controls-disabled .vjs-big-play-button,.vjs-error .vjs-big-play-button,.vjs-has-started .vjs-big-play-button,.vjs-using-native-controls .vjs-big-play-button{display:none}.vjs-has-started.vjs-paused.vjs-show-big-play-button-on-pause:not(.vjs-seeking,.vjs-scrubbing,.vjs-error) .vjs-big-play-button{display:block}.video-js button{background:0 0;border:none;color:inherit;display:inline-block;font-size:inherit;line-height:inherit;text-transform:none;text-decoration:none;transition:none;-webkit-appearance:none;-moz-appearance:none;appearance:none}.video-js.vjs-spatial-navigation-enabled .vjs-button:focus{outline:.0625em solid #fff;box-shadow:none}.vjs-control .vjs-button{width:100%;height:100%}.video-js .vjs-control.vjs-close-button{cursor:pointer;height:3em;position:absolute;right:0;top:.5em;z-index:2}.video-js .vjs-modal-dialog{background:rgba(0,0,0,.8);background:linear-gradient(180deg,rgba(0,0,0,.8),rgba(255,255,255,0));overflow:auto}.video-js .vjs-modal-dialog>*{box-sizing:border-box}.vjs-modal-dialog .vjs-modal-dialog-content{font-size:1.2em;line-height:1.5;padding:20px 24px;z-index:1}.vjs-menu-button{cursor:pointer}.vjs-menu-button.vjs-disabled{cursor:default}.vjs-workinghover .vjs-menu-button.vjs-disabled:hover .vjs-menu{display:none}.vjs-menu .vjs-menu-content{display:block;padding:0;margin:0;font-family:Arial,Helvetica,sans-serif;overflow:auto}.vjs-menu .vjs-menu-content>*{box-sizing:border-box}.vjs-scrubbing .vjs-control.vjs-menu-button:hover .vjs-menu{display:none}.vjs-menu li{display:flex;justify-content:center;list-style:none;margin:0;padding:.2em 0;line-height:1.4em;font-size:1.2em;text-align:center;text-transform:lowercase}.js-focus-visible .vjs-menu li.vjs-menu-item:hover,.vjs-menu li.vjs-menu-item:focus,.vjs-menu li.vjs-menu-item:hover{background-color:rgb(114.9141509434,132.7028301887,159.3858490566);background-color:rgba(114.9141509434,132.7028301887,159.3858490566,.5)}.js-focus-visible .vjs-menu li.vjs-selected:hover,.vjs-menu li.vjs-selected,.vjs-menu li.vjs-selected:focus,.vjs-menu li.vjs-selected:hover{background-color:#fff;color:#2b333f}.js-focus-visible .vjs-menu li.vjs-selected:hover .vjs-svg-icon,.vjs-menu li.vjs-selected .vjs-svg-icon,.vjs-menu li.vjs-selected:focus .vjs-svg-icon,.vjs-menu li.vjs-selected:hover .vjs-svg-icon{fill:#000}.js-focus-visible .vjs-menu :not(.vjs-selected):focus:not(.focus-visible),.video-js .vjs-menu :not(.vjs-selected):focus:not(:focus-visible){background:0 0}.vjs-menu li.vjs-menu-title{text-align:center;text-transform:uppercase;font-size:1em;line-height:2em;padding:0;margin:0 0 .3em 0;font-weight:700;cursor:default}.vjs-menu-button-popup .vjs-menu{display:none;position:absolute;bottom:0;width:10em;left:-3em;height:0;margin-bottom:1.5em;border-top-color:rgba(43,51,63,.7)}.vjs-pip-window .vjs-menu-button-popup .vjs-menu{left:unset;right:1em}.vjs-menu-button-popup .vjs-menu .vjs-menu-content{background-color:#2b333f;background-color:rgba(43,51,63,.7);position:absolute;width:100%;bottom:1.5em;max-height:15em}.vjs-layout-tiny .vjs-menu-button-popup .vjs-menu .vjs-menu-content,.vjs-layout-x-small .vjs-menu-button-popup .vjs-menu .vjs-menu-content{max-height:5em}.vjs-layout-small .vjs-menu-button-popup .vjs-menu .vjs-menu-content{max-height:10em}.vjs-layout-medium .vjs-menu-button-popup .vjs-menu .vjs-menu-content{max-height:14em}.vjs-layout-huge .vjs-menu-button-popup .vjs-menu .vjs-menu-content,.vjs-layout-large .vjs-menu-button-popup .vjs-menu .vjs-menu-content,.vjs-layout-x-large .vjs-menu-button-popup .vjs-menu .vjs-menu-content{max-height:25em}.vjs-menu-button-popup .vjs-menu.vjs-lock-showing,.vjs-workinghover .vjs-menu-button-popup.vjs-hover .vjs-menu{display:block}.video-js .vjs-menu-button-inline{transition:all .4s;overflow:hidden}.video-js .vjs-menu-button-inline:before{width:2.222222222em}.video-js .vjs-menu-button-inline.vjs-slider-active,.video-js .vjs-menu-button-inline:focus,.video-js .vjs-menu-button-inline:hover{width:12em}.vjs-menu-button-inline .vjs-menu{opacity:0;height:100%;width:auto;position:absolute;left:4em;top:0;padding:0;margin:0;transition:all .4s}.vjs-menu-button-inline.vjs-slider-active .vjs-menu,.vjs-menu-button-inline:focus .vjs-menu,.vjs-menu-button-inline:hover .vjs-menu{display:block;opacity:1}.vjs-menu-button-inline .vjs-menu-content{width:auto;height:100%;margin:0;overflow:hidden}.video-js .vjs-control-bar{display:none;width:100%;position:absolute;bottom:0;left:0;right:0;height:3em;background-color:#2b333f;background-color:rgba(43,51,63,.7)}.video-js.vjs-spatial-navigation-enabled .vjs-control-bar{gap:1px}.video-js:not(.vjs-controls-disabled,.vjs-using-native-controls,.vjs-error) .vjs-control-bar.vjs-lock-showing{display:flex!important}.vjs-audio-only-mode .vjs-control-bar,.vjs-has-started .vjs-control-bar{display:flex;visibility:visible;opacity:1;transition:visibility .1s,opacity .1s}.vjs-has-started.vjs-user-inactive.vjs-playing .vjs-control-bar{visibility:visible;opacity:0;pointer-events:none;transition:visibility 1s,opacity 1s}.vjs-controls-disabled .vjs-control-bar,.vjs-error .vjs-control-bar,.vjs-using-native-controls .vjs-control-bar{display:none!important}.vjs-audio-only-mode.vjs-has-started.vjs-user-inactive.vjs-playing .vjs-control-bar,.vjs-audio.vjs-has-started.vjs-user-inactive.vjs-playing .vjs-control-bar{opacity:1;visibility:visible;pointer-events:auto}.video-js .vjs-control{position:relative;text-align:center;margin:0;padding:0;height:100%;width:4em;flex:none}.video-js .vjs-control.vjs-visible-text{width:auto;padding-left:1em;padding-right:1em}.vjs-button>.vjs-icon-placeholder:before{font-size:1.8em;line-height:1.67}.vjs-button>.vjs-icon-placeholder{display:block}.vjs-button>.vjs-svg-icon{display:inline-block}.video-js .vjs-control:focus,.video-js .vjs-control:focus:before,.video-js .vjs-control:hover:before{text-shadow:0 0 1em #fff}.video-js :not(.vjs-visible-text)>.vjs-control-text{border:0;clip:rect(0 0 0 0);height:1px;overflow:hidden;padding:0;position:absolute;width:1px}.video-js .vjs-custom-control-spacer{display:none}.video-js .vjs-progress-control{cursor:pointer;flex:auto;display:flex;align-items:center;min-width:4em;touch-action:none}.video-js .vjs-progress-control.disabled{cursor:default}.vjs-live .vjs-progress-control{display:none}.vjs-liveui .vjs-progress-control{display:flex;align-items:center}.video-js .vjs-progress-holder{flex:auto;transition:all .2s;height:.3em}.video-js .vjs-progress-control .vjs-progress-holder{margin:0 10px}.video-js .vjs-progress-control:hover .vjs-progress-holder,.video-js.vjs-scrubbing.vjs-touch-enabled .vjs-progress-control .vjs-progress-holder{font-size:1.6666666667em}.video-js .vjs-progress-control:hover .vjs-progress-holder.disabled{font-size:1em}.video-js .vjs-progress-holder .vjs-load-progress,.video-js .vjs-progress-holder .vjs-load-progress div,.video-js .vjs-progress-holder .vjs-play-progress{position:absolute;display:block;height:100%;margin:0;padding:0;width:0}.video-js .vjs-play-progress{background-color:#fff}.video-js .vjs-play-progress:before{font-size:.9em;position:absolute;right:-.5em;line-height:.35em;z-index:1}.vjs-svg-icons-enabled .vjs-play-progress:before{content:none!important}.vjs-play-progress .vjs-svg-icon{position:absolute;top:-.35em;right:-.4em;width:.9em;height:.9em;pointer-events:none;line-height:.15em;z-index:1}.video-js .vjs-load-progress{background:rgba(114.9141509434,132.7028301887,159.3858490566,.5)}.video-js .vjs-load-progress div{background:rgba(114.9141509434,132.7028301887,159.3858490566,.75)}.video-js .vjs-time-tooltip{background-color:#fff;background-color:rgba(255,255,255,.8);border-radius:.3em;color:#000;float:right;font-family:Arial,Helvetica,sans-serif;font-size:1em;padding:6px 8px 8px 8px;pointer-events:none;position:absolute;top:-3.4em;visibility:hidden;z-index:1}.video-js .vjs-progress-holder:focus .vjs-time-tooltip{display:none}.video-js .vjs-progress-control:hover .vjs-progress-holder:focus .vjs-time-tooltip,.video-js .vjs-progress-control:hover .vjs-time-tooltip,.video-js.vjs-scrubbing.vjs-touch-enabled .vjs-progress-control .vjs-time-tooltip{display:block;font-size:.6em;visibility:visible}.video-js .vjs-progress-control.disabled:hover .vjs-time-tooltip{font-size:1em}.video-js .vjs-progress-control .vjs-mouse-display{display:none;position:absolute;width:1px;height:100%;background-color:#000;z-index:1}.video-js .vjs-progress-control:hover .vjs-mouse-display{display:block}.video-js.vjs-scrubbing.vjs-touch-enabled .vjs-progress-control .vjs-mouse-display{display:block}.video-js.vjs-touch-enabled:not(.vjs-scrubbing) .vjs-progress-control .vjs-mouse-display,.video-js.vjs-user-inactive .vjs-progress-control .vjs-mouse-display{visibility:hidden;opacity:0;transition:visibility 1s,opacity 1s}.vjs-mouse-display .vjs-time-tooltip{color:#fff;background-color:#000;background-color:rgba(0,0,0,.8)}.video-js .vjs-slider{position:relative;cursor:pointer;padding:0;margin:0 .45em 0 .45em;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;user-select:none;background-color:rgb(114.9141509434,132.7028301887,159.3858490566);background-color:rgba(114.9141509434,132.7028301887,159.3858490566,.5)}.video-js .vjs-slider.disabled{cursor:default}.video-js .vjs-slider:focus{text-shadow:0 0 1em #fff;box-shadow:0 0 1em #fff}.video-js.vjs-spatial-navigation-enabled .vjs-slider:focus{outline:.0625em solid #fff}.video-js .vjs-mute-control{cursor:pointer;flex:none}.video-js .vjs-volume-control{cursor:pointer;margin-right:1em;display:flex}.video-js .vjs-volume-control.vjs-volume-horizontal{width:5em}.video-js .vjs-volume-panel .vjs-volume-control{visibility:visible;opacity:0;width:1px;height:1px;margin-left:-1px}.video-js .vjs-volume-panel{transition:width 1s}.video-js .vjs-volume-panel .vjs-volume-control.vjs-slider-active,.video-js .vjs-volume-panel .vjs-volume-control:active,.video-js .vjs-volume-panel.vjs-hover .vjs-mute-control~.vjs-volume-control,.video-js .vjs-volume-panel.vjs-hover .vjs-volume-control,.video-js .vjs-volume-panel:active .vjs-volume-control,.video-js .vjs-volume-panel:focus .vjs-volume-control{visibility:visible;opacity:1;position:relative;transition:visibility .1s,opacity .1s,height .1s,width .1s,left 0s,top 0s}.video-js .vjs-volume-panel .vjs-volume-control.vjs-slider-active.vjs-volume-horizontal,.video-js .vjs-volume-panel .vjs-volume-control:active.vjs-volume-horizontal,.video-js .vjs-volume-panel.vjs-hover .vjs-mute-control~.vjs-volume-control.vjs-volume-horizontal,.video-js .vjs-volume-panel.vjs-hover .vjs-volume-control.vjs-volume-horizontal,.video-js .vjs-volume-panel:active .vjs-volume-control.vjs-volume-horizontal,.video-js .vjs-volume-panel:focus .vjs-volume-control.vjs-volume-horizontal{width:5em;height:3em;margin-right:0}.video-js .vjs-volume-panel .vjs-volume-control.vjs-slider-active.vjs-volume-vertical,.video-js .vjs-volume-panel .vjs-volume-control:active.vjs-volume-vertical,.video-js .vjs-volume-panel.vjs-hover .vjs-mute-control~.vjs-volume-control.vjs-volume-vertical,.video-js .vjs-volume-panel.vjs-hover .vjs-volume-control.vjs-volume-vertical,.video-js .vjs-volume-panel:active .vjs-volume-control.vjs-volume-vertical,.video-js .vjs-volume-panel:focus .vjs-volume-control.vjs-volume-vertical{left:-3.5em;transition:left 0s}.video-js .vjs-volume-panel.vjs-volume-panel-horizontal.vjs-hover,.video-js .vjs-volume-panel.vjs-volume-panel-horizontal.vjs-slider-active,.video-js .vjs-volume-panel.vjs-volume-panel-horizontal:active{width:10em;transition:width .1s}.video-js .vjs-volume-panel.vjs-volume-panel-horizontal.vjs-mute-toggle-only{width:4em}.video-js .vjs-volume-panel .vjs-volume-control.vjs-volume-vertical{height:8em;width:3em;left:-3000em;transition:visibility 1s,opacity 1s,height 1s 1s,width 1s 1s,left 1s 1s,top 1s 1s}.video-js .vjs-volume-panel .vjs-volume-control.vjs-volume-horizontal{transition:visibility 1s,opacity 1s,height 1s 1s,width 1s,left 1s 1s,top 1s 1s}.video-js .vjs-volume-panel{display:flex}.video-js .vjs-volume-bar{margin:1.35em .45em}.vjs-volume-bar.vjs-slider-horizontal{width:5em;height:.3em}.vjs-volume-bar.vjs-slider-vertical{width:.3em;height:5em;margin:1.35em auto}.video-js .vjs-volume-level{position:absolute;bottom:0;left:0;background-color:#fff}.video-js .vjs-volume-level:before{position:absolute;font-size:.9em;z-index:1}.vjs-slider-vertical .vjs-volume-level{width:.3em}.vjs-slider-vertical .vjs-volume-level:before{top:-.5em;left:-.3em;z-index:1}.vjs-svg-icons-enabled .vjs-volume-level:before{content:none}.vjs-volume-level .vjs-svg-icon{position:absolute;width:.9em;height:.9em;pointer-events:none;z-index:1}.vjs-slider-horizontal .vjs-volume-level{height:.3em}.vjs-slider-horizontal .vjs-volume-level:before{line-height:.35em;right:-.5em}.vjs-slider-horizontal .vjs-volume-level .vjs-svg-icon{right:-.3em;transform:translateY(-50%)}.vjs-slider-vertical .vjs-volume-level .vjs-svg-icon{top:-.55em;transform:translateX(-50%)}.video-js .vjs-volume-panel.vjs-volume-panel-vertical{width:4em}.vjs-volume-bar.vjs-slider-vertical .vjs-volume-level{height:100%}.vjs-volume-bar.vjs-slider-horizontal .vjs-volume-level{width:100%}.video-js .vjs-volume-vertical{width:3em;height:8em;bottom:8em;background-color:#2b333f;background-color:rgba(43,51,63,.7)}.video-js .vjs-volume-horizontal .vjs-menu{left:-2em}.video-js .vjs-volume-tooltip{background-color:#fff;background-color:rgba(255,255,255,.8);border-radius:.3em;color:#000;float:right;font-family:Arial,Helvetica,sans-serif;font-size:1em;padding:6px 8px 8px 8px;pointer-events:none;position:absolute;top:-3.4em;visibility:hidden;z-index:1}.video-js .vjs-volume-control:hover .vjs-progress-holder:focus .vjs-volume-tooltip,.video-js .vjs-volume-control:hover .vjs-volume-tooltip{display:block;font-size:1em;visibility:visible}.video-js .vjs-volume-vertical:hover .vjs-progress-holder:focus .vjs-volume-tooltip,.video-js .vjs-volume-vertical:hover .vjs-volume-tooltip{left:1em;top:-12px}.video-js .vjs-volume-control.disabled:hover .vjs-volume-tooltip{font-size:1em}.video-js .vjs-volume-control .vjs-mouse-display{display:none;position:absolute;width:100%;height:1px;background-color:#000;z-index:1}.video-js .vjs-volume-horizontal .vjs-mouse-display{width:1px;height:100%}.video-js .vjs-volume-control:hover .vjs-mouse-display{display:block}.video-js.vjs-user-inactive .vjs-volume-control .vjs-mouse-display{visibility:hidden;opacity:0;transition:visibility 1s,opacity 1s}.vjs-mouse-display .vjs-volume-tooltip{color:#fff;background-color:#000;background-color:rgba(0,0,0,.8)}.vjs-poster{display:inline-block;vertical-align:middle;cursor:pointer;margin:0;padding:0;position:absolute;top:0;right:0;bottom:0;left:0;height:100%}.vjs-has-started .vjs-poster,.vjs-using-native-controls .vjs-poster{display:none}.vjs-audio.vjs-has-started .vjs-poster,.vjs-has-started.vjs-audio-poster-mode .vjs-poster,.vjs-pip-container.vjs-has-started .vjs-poster{display:block}.vjs-poster img{width:100%;height:100%;object-fit:contain}.video-js .vjs-live-control{display:flex;align-items:flex-start;flex:auto;font-size:1em;line-height:3em}.video-js.vjs-liveui .vjs-live-control,.video-js:not(.vjs-live) .vjs-live-control{display:none}.video-js .vjs-seek-to-live-control{align-items:center;cursor:pointer;flex:none;display:inline-flex;height:100%;padding-left:.5em;padding-right:.5em;font-size:1em;line-height:3em;width:auto;min-width:4em}.video-js.vjs-live:not(.vjs-liveui) .vjs-seek-to-live-control,.video-js:not(.vjs-live) .vjs-seek-to-live-control{display:none}.vjs-seek-to-live-control.vjs-control.vjs-at-live-edge{cursor:auto}.vjs-seek-to-live-control .vjs-icon-placeholder{margin-right:.5em;color:#888}.vjs-svg-icons-enabled .vjs-seek-to-live-control{line-height:0}.vjs-seek-to-live-control .vjs-svg-icon{width:1em;height:1em;pointer-events:none;fill:#888}.vjs-seek-to-live-control.vjs-control.vjs-at-live-edge .vjs-icon-placeholder{color:red}.vjs-seek-to-live-control.vjs-control.vjs-at-live-edge .vjs-svg-icon{fill:red}.video-js .vjs-time-control{flex:none;font-size:1em;line-height:3em;min-width:2em;width:auto;padding-left:1em;padding-right:1em}.video-js .vjs-current-time,.video-js .vjs-duration,.vjs-live .vjs-time-control,.vjs-live .vjs-time-divider{display:none}.vjs-time-divider{display:none;line-height:3em}.vjs-normalise-time-controls:not(.vjs-live) .vjs-time-control{display:flex}.video-js .vjs-play-control{cursor:pointer}.video-js .vjs-play-control .vjs-icon-placeholder{flex:none}.vjs-text-track-display{position:absolute;bottom:3em;left:0;right:0;top:0;pointer-events:none}.vjs-error .vjs-text-track-display{display:none}.video-js.vjs-controls-disabled .vjs-text-track-display,.video-js.vjs-user-inactive.vjs-playing .vjs-text-track-display{bottom:1em}.video-js .vjs-text-track{font-size:1.4em;text-align:center;margin-bottom:.1em}.vjs-subtitles{color:#fff}.vjs-captions{color:#fc6}.vjs-tt-cue{display:block}video::-webkit-media-text-track-display{transform:translateY(-3em)}.video-js.vjs-controls-disabled video::-webkit-media-text-track-display,.video-js.vjs-user-inactive.vjs-playing video::-webkit-media-text-track-display{transform:translateY(-1.5em)}.video-js.vjs-force-center-align-cues .vjs-text-track-cue{text-align:center!important;width:80%!important}@supports not (inset:10px){.video-js .vjs-text-track-display>div{top:0;right:0;bottom:0;left:0}}.video-js .vjs-picture-in-picture-control{cursor:pointer;flex:none}.video-js.vjs-audio-only-mode .vjs-picture-in-picture-control,.vjs-pip-window .vjs-picture-in-picture-control{display:none}.video-js .vjs-fullscreen-control{cursor:pointer;flex:none}.video-js.vjs-audio-only-mode .vjs-fullscreen-control,.vjs-pip-window .vjs-fullscreen-control{display:none}.vjs-playback-rate .vjs-playback-rate-value,.vjs-playback-rate>.vjs-menu-button{position:absolute;top:0;left:0;width:100%;height:100%}.vjs-playback-rate .vjs-playback-rate-value{pointer-events:none;font-size:1.5em;line-height:2;text-align:center}.vjs-playback-rate .vjs-menu{width:4em;left:0}.vjs-error .vjs-error-display .vjs-modal-dialog-content{font-size:1.4em;text-align:center}.vjs-loading-spinner{display:none;position:absolute;top:50%;left:50%;transform:translate(-50%,-50%);opacity:.85;text-align:left;border:.6em solid rgba(43,51,63,.7);box-sizing:border-box;background-clip:padding-box;width:5em;height:5em;border-radius:50%;visibility:hidden}.vjs-seeking .vjs-loading-spinner,.vjs-waiting .vjs-loading-spinner{display:flex;justify-content:center;align-items:center;animation:vjs-spinner-show 0s linear .3s forwards}.vjs-error .vjs-loading-spinner{display:none}.vjs-loading-spinner:after,.vjs-loading-spinner:before{content:"";position:absolute;box-sizing:inherit;width:inherit;height:inherit;border-radius:inherit;opacity:1;border:inherit;border-color:transparent;border-top-color:#fff}.vjs-seeking .vjs-loading-spinner:after,.vjs-seeking .vjs-loading-spinner:before,.vjs-waiting .vjs-loading-spinner:after,.vjs-waiting .vjs-loading-spinner:before{animation:vjs-spinner-spin 1.1s cubic-bezier(.6,.2,0,.8) infinite,vjs-spinner-fade 1.1s linear infinite}.vjs-seeking .vjs-loading-spinner:before,.vjs-waiting .vjs-loading-spinner:before{border-top-color:#fff}.vjs-seeking .vjs-loading-spinner:after,.vjs-waiting .vjs-loading-spinner:after{border-top-color:#fff;animation-delay:.44s}@keyframes vjs-spinner-show{to{visibility:visible}}@keyframes vjs-spinner-spin{100%{transform:rotate(360deg)}}@keyframes vjs-spinner-fade{0%{border-top-color:rgb(114.9141509434,132.7028301887,159.3858490566)}20%{border-top-color:rgb(114.9141509434,132.7028301887,159.3858490566)}35%{border-top-color:#fff}60%{border-top-color:rgb(114.9141509434,132.7028301887,159.3858490566)}100%{border-top-color:rgb(114.9141509434,132.7028301887,159.3858490566)}}.video-js.vjs-audio-only-mode .vjs-captions-button{display:none}.vjs-chapters-button .vjs-menu ul{width:24em}.video-js.vjs-audio-only-mode .vjs-descriptions-button{display:none}.vjs-subs-caps-button+.vjs-menu .vjs-captions-menu-item .vjs-svg-icon{width:1.5em;height:1.5em}.video-js .vjs-subs-caps-button+.vjs-menu .vjs-captions-menu-item .vjs-menu-item-text .vjs-icon-placeholder{vertical-align:middle;display:inline-block;margin-bottom:-.1em}.video-js .vjs-subs-caps-button+.vjs-menu .vjs-captions-menu-item .vjs-menu-item-text .vjs-icon-placeholder:before{font-family:VideoJS;content:"\f10c";font-size:1.5em;line-height:inherit}.video-js.vjs-audio-only-mode .vjs-subs-caps-button{display:none}.video-js .vjs-audio-button+.vjs-menu .vjs-descriptions-menu-item .vjs-menu-item-text .vjs-icon-placeholder,.video-js .vjs-audio-button+.vjs-menu .vjs-main-desc-menu-item .vjs-menu-item-text .vjs-icon-placeholder{vertical-align:middle;display:inline-block;margin-bottom:-.1em}.video-js .vjs-audio-button+.vjs-menu .vjs-descriptions-menu-item .vjs-menu-item-text .vjs-icon-placeholder:before,.video-js .vjs-audio-button+.vjs-menu .vjs-main-desc-menu-item .vjs-menu-item-text .vjs-icon-placeholder:before{font-family:VideoJS;content:" \f12e";font-size:1.5em;line-height:inherit}.video-js.vjs-layout-small .vjs-current-time,.video-js.vjs-layout-small .vjs-duration,.video-js.vjs-layout-small .vjs-playback-rate,.video-js.vjs-layout-small .vjs-remaining-time,.video-js.vjs-layout-small .vjs-time-divider,.video-js.vjs-layout-small .vjs-volume-control,.video-js.vjs-layout-tiny .vjs-current-time,.video-js.vjs-layout-tiny .vjs-duration,.video-js.vjs-layout-tiny .vjs-playback-rate,.video-js.vjs-layout-tiny .vjs-remaining-time,.video-js.vjs-layout-tiny .vjs-time-divider,.video-js.vjs-layout-tiny .vjs-volume-control,.video-js.vjs-layout-x-small .vjs-current-time,.video-js.vjs-layout-x-small .vjs-duration,.video-js.vjs-layout-x-small .vjs-playback-rate,.video-js.vjs-layout-x-small .vjs-remaining-time,.video-js.vjs-layout-x-small .vjs-time-divider,.video-js.vjs-layout-x-small .vjs-volume-control{display:none}.video-js.vjs-layout-small .vjs-volume-panel.vjs-volume-panel-horizontal.vjs-hover,.video-js.vjs-layout-small .vjs-volume-panel.vjs-volume-panel-horizontal.vjs-slider-active,.video-js.vjs-layout-small .vjs-volume-panel.vjs-volume-panel-horizontal:active,.video-js.vjs-layout-small .vjs-volume-panel.vjs-volume-panel-horizontal:hover,.video-js.vjs-layout-tiny .vjs-volume-panel.vjs-volume-panel-horizontal.vjs-hover,.video-js.vjs-layout-tiny .vjs-volume-panel.vjs-volume-panel-horizontal.vjs-slider-active,.video-js.vjs-layout-tiny .vjs-volume-panel.vjs-volume-panel-horizontal:active,.video-js.vjs-layout-tiny .vjs-volume-panel.vjs-volume-panel-horizontal:hover,.video-js.vjs-layout-x-small .vjs-volume-panel.vjs-volume-panel-horizontal.vjs-hover,.video-js.vjs-layout-x-small .vjs-volume-panel.vjs-volume-panel-horizontal.vjs-slider-active,.video-js.vjs-layout-x-small .vjs-volume-panel.vjs-volume-panel-horizontal:active,.video-js.vjs-layout-x-small .vjs-volume-panel.vjs-volume-panel-horizontal:hover{width:auto;width:initial}.video-js.vjs-layout-tiny .vjs-progress-control,.video-js.vjs-layout-x-small .vjs-progress-control{display:none}.video-js.vjs-layout-x-small .vjs-custom-control-spacer{flex:auto;display:block}.vjs-modal-dialog.vjs-text-track-settings{background-color:#2b333f;background-color:rgba(43,51,63,.75);color:#fff;height:70%}.vjs-spatial-navigation-enabled .vjs-modal-dialog.vjs-text-track-settings{height:80%}.vjs-error .vjs-text-track-settings{display:none}.vjs-text-track-settings .vjs-modal-dialog-content{display:table}.vjs-text-track-settings .vjs-track-settings-colors,.vjs-text-track-settings .vjs-track-settings-controls,.vjs-text-track-settings .vjs-track-settings-font{display:table-cell}.vjs-text-track-settings .vjs-track-settings-controls{text-align:right;vertical-align:bottom}@supports (display:grid){.vjs-text-track-settings .vjs-modal-dialog-content{display:grid;grid-template-columns:1fr 1fr;grid-template-rows:1fr;padding:20px 24px 0 24px}.vjs-track-settings-controls .vjs-default-button{margin-bottom:20px}.vjs-text-track-settings .vjs-track-settings-controls{grid-column:1/-1}.vjs-layout-small .vjs-text-track-settings .vjs-modal-dialog-content,.vjs-layout-tiny .vjs-text-track-settings .vjs-modal-dialog-content,.vjs-layout-x-small .vjs-text-track-settings .vjs-modal-dialog-content{grid-template-columns:1fr}}.vjs-text-track-settings select{font-size:inherit}.vjs-track-setting>select{margin-right:1em;margin-bottom:.5em}.vjs-text-track-settings fieldset{margin:10px;border:none}.vjs-text-track-settings fieldset span{display:inline-block;padding:0 .6em .8em}.vjs-text-track-settings fieldset span>select{max-width:7.3em}.vjs-text-track-settings legend{color:#fff;font-weight:700;font-size:1.2em}.vjs-text-track-settings .vjs-label{margin:0 .5em .5em 0}.vjs-track-settings-controls button:active,.vjs-track-settings-controls button:focus{outline-style:solid;outline-width:medium;background-image:linear-gradient(0deg,#fff 88%,rgb(114.9141509434,132.7028301887,159.3858490566) 100%)}.vjs-track-settings-controls button:hover{color:rgba(43,51,63,.75)}.vjs-track-settings-controls button{background-color:#fff;background-image:linear-gradient(-180deg,#fff 88%,rgb(114.9141509434,132.7028301887,159.3858490566) 100%);color:#2b333f;cursor:pointer;border-radius:2px}.vjs-track-settings-controls .vjs-default-button{margin-right:1em}.vjs-title-bar{background:rgba(0,0,0,.9);background:linear-gradient(180deg,rgba(0,0,0,.9) 0,rgba(0,0,0,.7) 60%,rgba(0,0,0,0) 100%);font-size:1.2em;line-height:1.5;transition:opacity .1s;padding:.666em 1.333em 4em;pointer-events:none;position:absolute;top:0;width:100%}.vjs-error .vjs-title-bar{display:none}.vjs-title-bar-description,.vjs-title-bar-title{margin:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.vjs-title-bar-title{font-weight:700;margin-bottom:.333em}.vjs-playing.vjs-user-inactive .vjs-title-bar{opacity:0;transition:opacity 1s}.video-js .vjs-skip-forward-5{cursor:pointer}.video-js .vjs-skip-forward-10{cursor:pointer}.video-js .vjs-skip-forward-30{cursor:pointer}.video-js .vjs-skip-backward-5{cursor:pointer}.video-js .vjs-skip-backward-10{cursor:pointer}.video-js .vjs-skip-backward-30{cursor:pointer}.video-js .vjs-transient-button{position:absolute;height:3em;display:flex;align-items:center;justify-content:center;background-color:rgba(50,50,50,.5);cursor:pointer;opacity:1;transition:opacity 1s}.video-js:not(.vjs-has-started) .vjs-transient-button{display:none}.video-js.not-hover .vjs-transient-button:not(.force-display),.video-js.vjs-user-inactive .vjs-transient-button:not(.force-display){opacity:0}.video-js .vjs-transient-button span{padding:0 .5em}.video-js .vjs-transient-button.vjs-left{left:1em}.video-js .vjs-transient-button.vjs-right{right:1em}.video-js .vjs-transient-button.vjs-top{top:1em}.video-js .vjs-transient-button.vjs-near-top{top:4em}.video-js .vjs-transient-button.vjs-bottom{bottom:4em}.video-js .vjs-transient-button:hover{background-color:rgba(50,50,50,.9)}@media print{.video-js>:not(.vjs-tech):not(.vjs-poster){visibility:hidden}}.vjs-resize-manager{position:absolute;top:0;left:0;width:100%;height:100%;border:none;z-index:-1000}.js-focus-visible .video-js :focus:not(.focus-visible){outline:0}.video-js :focus:not(:focus-visible){outline:0} \ No newline at end of file diff --git a/view/js/videojs/video.min.js b/view/js/videojs/video.min.js new file mode 100644 index 0000000000..06474a27a1 --- /dev/null +++ b/view/js/videojs/video.min.js @@ -0,0 +1,53 @@ +/** + * @license + * Video.js 8.23.4zh(e),textRanges:e=>{let t="",i;for(i=0;i a?null:{segment:s=i>new Date(n)?e:s,estimatedStart:s.videoTimingInfo?s.videoTimingInfo.transmuxedPresentationStart:ph.duration(t,t.mediaSequence+t.segments.indexOf(s)),type:s.videoTimingInfo?"accurate":"estimate"}})(e,t))?(l=((e,t)=>{let i,s;try{i=new Date(e),s=new Date(t)}catch(e){}e=i.getTime();return(s.getTime()-e)/1e3})((o=d.segment).dateTimeObject,e),"estimate"===d.type?0===i?a({message:e+" is not buffered yet. Try again"}):(s(d.estimatedStart+l),void n.one("seeked",()=>{Xh({programTime:e,playlist:t,retryCount:i-1,seekTo:s,pauseAfterSeek:r,tech:n,callback:a})})):(d=o.start+l,n.one("seeked",()=>a(null,n.currentTime())),r&&n.pause(),void s(d))):a({message:e+" was not found in the stream"}):a({message:"programDateTime tags must be provided in the manifest "+t.resolvedUri}):a({message:"player must be playing a live stream to start buffering"}):a({message:"seekToProgramTime: programTime, seekTo and playlist must be provided"});throw new Error("seekToProgramTime: callback must be provided")},Kh=(e,t)=>{if(4===e.readyState)return t()},Yh=(e,t,r,s)=>{function n(e,t,i,s){return t.abort(),l=!0,r(e,t,i,s)}function i(e,t){var i;if(!l)return e?(e.metadata=Eh({requestType:s,request:t,error:e}),n(e,t,"",a)):(i=t.responseText.substring(a&&a.byteLength||0,t.responseText.length),a=function(){for(var e,t,i,s=arguments.length,r=new Array(s),n=0;n
TOC
- ";
$lastLevel = 1;
- $idNum = [0, 0, 0, 0, 0, 0, 0];
+ $idNum = [0, 0, 0, 0, 0, 0, 0];
foreach ($lines as &$line) {
$matches = [];
if (preg_match('#