summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json2
-rw-r--r--composer.lock122
-rw-r--r--l10n/ar.js1
-rw-r--r--l10n/ar.json1
-rw-r--r--l10n/ca.js2
-rw-r--r--l10n/ca.json2
-rw-r--r--l10n/is.js3
-rw-r--r--l10n/is.json3
-rw-r--r--l10n/mk.js4
-rw-r--r--l10n/mk.json4
-rw-r--r--l10n/pl.js4
-rw-r--r--l10n/pl.json4
-rw-r--r--l10n/pt_BR.js1
-rw-r--r--l10n/pt_BR.json1
-rw-r--r--l10n/ru.js1
-rw-r--r--l10n/ru.json1
-rw-r--r--l10n/sk.js2
-rw-r--r--l10n/sk.json2
-rw-r--r--l10n/sv.js2
-rw-r--r--l10n/sv.json2
-rw-r--r--lib/Command/Timeline.php4
-rw-r--r--lib/Controller/ActivityPubController.php5
-rw-r--r--lib/Controller/ApiController.php7
-rw-r--r--lib/Controller/OAuthController.php1
-rw-r--r--lib/Db/StreamRequest.php36
-rw-r--r--lib/Model/ActivityPub/ACore.php19
-rw-r--r--lib/Model/ActivityPub/Actor/Person.php2
-rw-r--r--lib/Model/ActivityPub/Object/Announce.php30
-rw-r--r--lib/Model/ActivityPub/Stream.php34
-rw-r--r--lib/Search/UnifiedSearchProvider.php5
-rw-r--r--lib/Service/ActivityService.php9
-rw-r--r--lib/Service/CacheActorService.php18
-rw-r--r--lib/Service/CacheDocumentService.php11
-rw-r--r--lib/Service/ConfigService.php20
-rw-r--r--lib/Service/CurlService.php112
-rw-r--r--lib/Service/SearchService.php9
-rw-r--r--lib/Service/SignatureService.php28
-rw-r--r--lib/Service/StreamService.php8
-rw-r--r--lib/Service/TestService.php8
-rw-r--r--package-lock.json381
-rw-r--r--package.json14
41 files changed, 567 insertions, 358 deletions
diff --git a/composer.json b/composer.json
index 2a6532ba..bc4315ce 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,7 @@
}
},
"require": {
- "daita/my-small-php-tools": "dev-master#ca9c257dd640576c072cb50282e15ae51147cfc2",
+ "daita/my-small-php-tools": "dev-master",
"gumlet/php-image-resize": "2.0.*",
"friendica/json-ld": "^1.0"
},
diff --git a/composer.lock b/composer.lock
index c951dbec..302f8fc2 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "a5fe26ce64e01c6e8e2687e75ff674fb",
+ "content-hash": "773474981fdf7ef0b2f1bcf58cf1b2ec",
"packages": [
{
"name": "daita/my-small-php-tools",
@@ -12,12 +12,12 @@
"source": {
"type": "git",
"url": "https://github.com/daita/my-small-php-tools.git",
- "reference": "ca9c257dd640576c072cb50282e15ae51147cfc2"
+ "reference": "aeed155a9c0cf79153bc9703d1792b0361162dd3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/daita/my-small-php-tools/zipball/ca9c257dd640576c072cb50282e15ae51147cfc2",
- "reference": "ca9c257dd640576c072cb50282e15ae51147cfc2",
+ "url": "https://api.github.com/repos/daita/my-small-php-tools/zipball/aeed155a9c0cf79153bc9703d1792b0361162dd3",
+ "reference": "aeed155a9c0cf79153bc9703d1792b0361162dd3",
"shasum": ""
},
"require": {
@@ -40,7 +40,7 @@
}
],
"description": "My small PHP Tools",
- "time": "2020-09-29T15:30:16+00:00"
+ "time": "2020-12-01T00:47:38+00:00"
},
{
"name": "friendica/json-ld",
@@ -1003,23 +1003,23 @@
},
{
"name": "sebastian/code-unit-reverse-lookup",
- "version": "1.0.1",
+ "version": "1.0.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
- "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18"
+ "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
- "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
+ "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/1de8cd5c010cb153fcd68b8d0f64606f523f7619",
+ "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619",
"shasum": ""
},
"require": {
- "php": "^5.6 || ^7.0"
+ "php": ">=5.6"
},
"require-dev": {
- "phpunit/phpunit": "^5.7 || ^6.0"
+ "phpunit/phpunit": "^8.5"
},
"type": "library",
"extra": {
@@ -1044,7 +1044,13 @@
],
"description": "Looks up which function or method a line of code belongs to",
"homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
- "time": "2017-03-04T06:30:41+00:00"
+ "funding": [
+ {
+ "url": "https://github.com/sebastianbergmann",
+ "type": "github"
+ }
+ ],
+ "time": "2020-11-30T08:15:22+00:00"
},
{
"name": "sebastian/comparator",
@@ -1214,20 +1220,20 @@
},
{
"name": "sebastian/exporter",
- "version": "3.1.2",
+ "version": "3.1.3",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/exporter.git",
- "reference": "68609e1261d215ea5b21b7987539cbfbe156ec3e"
+ "reference": "6b853149eab67d4da22291d36f5b0631c0fd856e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/68609e1261d215ea5b21b7987539cbfbe156ec3e",
- "reference": "68609e1261d215ea5b21b7987539cbfbe156ec3e",
+ "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/6b853149eab67d4da22291d36f5b0631c0fd856e",
+ "reference": "6b853149eab67d4da22291d36f5b0631c0fd856e",
"shasum": ""
},
"require": {
- "php": "^7.0",
+ "php": ">=7.0",
"sebastian/recursion-context": "^3.0"
},
"require-dev": {
@@ -1277,7 +1283,13 @@
"export",
"exporter"
],
- "time": "2019-09-14T09:02:43+00:00"
+ "funding": [
+ {
+ "url": "https://github.com/sebastianbergmann",
+ "type": "github"
+ }
+ ],
+ "time": "2020-11-30T07:47:53+00:00"
},
{
"name": "sebastian/global-state",
@@ -1332,20 +1344,20 @@
},
{
"name": "sebastian/object-enumerator",
- "version": "3.0.3",
+ "version": "3.0.4",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/object-enumerator.git",
- "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5"
+ "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/7cfd9e65d11ffb5af41198476395774d4c8a84c5",
- "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5",
+ "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2",
+ "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2",
"shasum": ""
},
"require": {
- "php": "^7.0",
+ "php": ">=7.0",
"sebastian/object-reflector": "^1.1.1",
"sebastian/recursion-context": "^3.0"
},
@@ -1375,24 +1387,30 @@
],
"description": "Traverses array structures and object graphs to enumerate all referenced objects",
"homepage": "https://github.com/sebastianbergmann/object-enumerator/",
- "time": "2017-08-03T12:35:26+00:00"
+ "funding": [
+ {
+ "url": "https://github.com/sebastianbergmann",
+ "type": "github"
+ }
+ ],
+ "time": "2020-11-30T07:40:27+00:00"
},
{
"name": "sebastian/object-reflector",
- "version": "1.1.1",
+ "version": "1.1.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/object-reflector.git",
- "reference": "773f97c67f28de00d397be301821b06708fca0be"
+ "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/773f97c67f28de00d397be301821b06708fca0be",
- "reference": "773f97c67f28de00d397be301821b06708fca0be",
+ "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/9b8772b9cbd456ab45d4a598d2dd1a1bced6363d",
+ "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d",
"shasum": ""
},
"require": {
- "php": "^7.0"
+ "php": ">=7.0"
},
"require-dev": {
"phpunit/phpunit": "^6.0"
@@ -1420,24 +1438,30 @@
],
"description": "Allows reflection of object attributes, including inherited and non-public ones",
"homepage": "https://github.com/sebastianbergmann/object-reflector/",
- "time": "2017-03-29T09:07:27+00:00"
+ "funding": [
+ {
+ "url": "https://github.com/sebastianbergmann",
+ "type": "github"
+ }
+ ],
+ "time": "2020-11-30T07:37:18+00:00"
},
{
"name": "sebastian/recursion-context",
- "version": "3.0.0",
+ "version": "3.0.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/recursion-context.git",
- "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8"
+ "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8",
- "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8",
+ "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/367dcba38d6e1977be014dc4b22f47a484dac7fb",
+ "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb",
"shasum": ""
},
"require": {
- "php": "^7.0"
+ "php": ">=7.0"
},
"require-dev": {
"phpunit/phpunit": "^6.0"
@@ -1459,21 +1483,27 @@
],
"authors": [
{
- "name": "Jeff Welch",
- "email": "whatthejeff@gmail.com"
- },
- {
"name": "Sebastian Bergmann",
"email": "sebastian@phpunit.de"
},
{
+ "name": "Jeff Welch",
+ "email": "whatthejeff@gmail.com"
+ },
+ {
"name": "Adam Harvey",
"email": "aharvey@php.net"
}
],
"description": "Provides functionality to recursively process PHP variables",
"homepage": "http://www.github.com/sebastianbergmann/recursion-context",
- "time": "2017-03-03T06:23:57+00:00"
+ "funding": [
+ {
+ "url": "https://github.com/sebastianbergmann",
+ "type": "github"
+ }
+ ],
+ "time": "2020-11-30T07:34:24+00:00"
},
{
"name": "sebastian/resource-operations",
@@ -1562,16 +1592,16 @@
},
{
"name": "symfony/polyfill-ctype",
- "version": "v1.18.1",
+ "version": "v1.19.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
- "reference": "1c302646f6efc070cd46856e600e5e0684d6b454"
+ "reference": "aed596913b70fae57be53d86faa2e9ef85a2297b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/1c302646f6efc070cd46856e600e5e0684d6b454",
- "reference": "1c302646f6efc070cd46856e600e5e0684d6b454",
+ "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/aed596913b70fae57be53d86faa2e9ef85a2297b",
+ "reference": "aed596913b70fae57be53d86faa2e9ef85a2297b",
"shasum": ""
},
"require": {
@@ -1583,7 +1613,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.18-dev"
+ "dev-main": "1.19-dev"
},
"thanks": {
"name": "symfony/polyfill",
@@ -1634,7 +1664,7 @@
"type": "tidelift"
}
],
- "time": "2020-07-14T12:35:20+00:00"
+ "time": "2020-10-23T09:01:57+00:00"
},
{
"name": "theseer/tokenizer",
diff --git a/l10n/ar.js b/l10n/ar.js
index 8bd650eb..76ff6e7b 100644
--- a/l10n/ar.js
+++ b/l10n/ar.js
@@ -39,6 +39,7 @@ OC.L10N.register(
"You are going to follow:" : "إنك بصدد متابعة:",
"Continue" : "المتابعة",
"User not found" : "لم يتم العثور على المستخدم",
+ "We automatically created a Social account for you. Your Social ID is the same as your Federated Cloud ID:" : "تم الانشاء التلقائي لـ حساب اجتماعي لك. معرفك الاجتماعي هو نفسه معرف السحابة المتحدة او Federated Cloud ID",
"Follow Nextcloud on mastodon.xyz" : "تابع Nextcloud على mastodon.xyz"
},
"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;");
diff --git a/l10n/ar.json b/l10n/ar.json
index ed82d759..eac26798 100644
--- a/l10n/ar.json
+++ b/l10n/ar.json
@@ -37,6 +37,7 @@
"You are going to follow:" : "إنك بصدد متابعة:",
"Continue" : "المتابعة",
"User not found" : "لم يتم العثور على المستخدم",
+ "We automatically created a Social account for you. Your Social ID is the same as your Federated Cloud ID:" : "تم الانشاء التلقائي لـ حساب اجتماعي لك. معرفك الاجتماعي هو نفسه معرف السحابة المتحدة او Federated Cloud ID",
"Follow Nextcloud on mastodon.xyz" : "تابع Nextcloud على mastodon.xyz"
},"pluralForm" :"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;"
} \ No newline at end of file
diff --git a/l10n/ca.js b/l10n/ca.js
index dbbd91ec..f5ba9cde 100644
--- a/l10n/ca.js
+++ b/l10n/ca.js
@@ -58,6 +58,7 @@ OC.L10N.register(
"No liked posts found" : "No s'han trobat publicacions agradades",
"You haven't tooted yet" : "Encara no heu fet res",
"No posts found for this tag" : "No s'han trobat publicacions per a aquesta etiqueta",
+ "No replies found" : "No s'ha trobat cap resposta",
"hasn't tooted yet" : "encara no s'ha fet res",
"Reply" : "Resposta",
"Boost" : "Recomana",
@@ -76,6 +77,7 @@ OC.L10N.register(
"User not found" : "No s'ha trobat l'usuari",
"Sorry, we could not find the account of {userId}" : "No s'ha pogut trobar el compte de {userId}",
"Nextcloud becomes part of the federated social networks!" : "Nextcloud ha passat a formar part de les xarxes socials federades!",
+ "We automatically created a Social account for you. Your Social ID is the same as your Federated Cloud ID:" : "Us hem creat automàticament un compte Social. El vostre ID Social és el mateix que el vostre ID del núvol federat:",
"Since you are new to Social, start by following the official Nextcloud account so you don't miss any news" : "Donat que sou nou a Social, comenceu seguint el compte oficial de Nextcloud i així no us perdreu cap notícia",
"Follow Nextcloud on mastodon.xyz" : "Segueix a Nextcloud a mastodon.xyz"
},
diff --git a/l10n/ca.json b/l10n/ca.json
index 4771bd60..a700cecd 100644
--- a/l10n/ca.json
+++ b/l10n/ca.json
@@ -56,6 +56,7 @@
"No liked posts found" : "No s'han trobat publicacions agradades",
"You haven't tooted yet" : "Encara no heu fet res",
"No posts found for this tag" : "No s'han trobat publicacions per a aquesta etiqueta",
+ "No replies found" : "No s'ha trobat cap resposta",
"hasn't tooted yet" : "encara no s'ha fet res",
"Reply" : "Resposta",
"Boost" : "Recomana",
@@ -74,6 +75,7 @@
"User not found" : "No s'ha trobat l'usuari",
"Sorry, we could not find the account of {userId}" : "No s'ha pogut trobar el compte de {userId}",
"Nextcloud becomes part of the federated social networks!" : "Nextcloud ha passat a formar part de les xarxes socials federades!",
+ "We automatically created a Social account for you. Your Social ID is the same as your Federated Cloud ID:" : "Us hem creat automàticament un compte Social. El vostre ID Social és el mateix que el vostre ID del núvol federat:",
"Since you are new to Social, start by following the official Nextcloud account so you don't miss any news" : "Donat que sou nou a Social, comenceu seguint el compte oficial de Nextcloud i així no us perdreu cap notícia",
"Follow Nextcloud on mastodon.xyz" : "Segueix a Nextcloud a mastodon.xyz"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/l10n/is.js b/l10n/is.js
index 51f44976..4e10d564 100644
--- a/l10n/is.js
+++ b/l10n/is.js
@@ -56,6 +56,7 @@ OC.L10N.register(
"No liked posts found" : "Engar líkaðar færslur fundust",
"You haven't tooted yet" : "Þú hefur ekki tíst neitt ennþá",
"No posts found for this tag" : "Engar færslur fundust fyrir þetta merki",
+ "No replies found" : "Engin svör fundust",
"hasn't tooted yet" : "hefur ekki tíst neitt ennþá",
"Reply" : "Svara",
"Boost" : "Endurbirta",
@@ -70,9 +71,11 @@ OC.L10N.register(
"You are going to follow:" : "Þú ert að fara að fylgjast með:",
"name@domain of your federation account" : "nafn@lén á sambandstengda aðganginum þínum",
"Continue" : "Halda áfram",
+ "This step is needed as the user is probably not registered on the same server as you are. We will redirect you to your homeserver to follow this account." : "Þetta skref er nauðsynlegt þar sem notandinn er líklega ekki skráður á sama netþjóni og þú. Við endurbeinum þér á heimanetþjóninn þinn til að fylgja þessum aðgangi.",
"User not found" : "Notandi fannst ekki",
"Sorry, we could not find the account of {userId}" : "Því miður, við gátum ekki fundið notandaaðganginn {userId}",
"Nextcloud becomes part of the federated social networks!" : "Nextcloud verður hluti af samfélagsnetum í skýjasambandi!",
+ "We automatically created a Social account for you. Your Social ID is the same as your Federated Cloud ID:" : "Við útbjuggum sjálfvirkt samfélagsnetsaðgang fyrir þíg. Samfélagsnetsauðkennið þitt er það sama og skýjasambandsauðkennið þitt (Federated Cloud ID):",
"Since you are new to Social, start by following the official Nextcloud account so you don't miss any news" : "Þar sem þú ert nýr á samfélagsnetinu, byrjaðu þá á því að fylgjast með opinbera Nextcloud aðgangnum svo þú missir ekki af neinu fréttnæmu",
"Follow Nextcloud on mastodon.xyz" : "Fylgstu með Nextcloud á mastodon.xyz"
},
diff --git a/l10n/is.json b/l10n/is.json
index b5e13fdd..c00b717a 100644
--- a/l10n/is.json
+++ b/l10n/is.json
@@ -54,6 +54,7 @@
"No liked posts found" : "Engar líkaðar færslur fundust",
"You haven't tooted yet" : "Þú hefur ekki tíst neitt ennþá",
"No posts found for this tag" : "Engar færslur fundust fyrir þetta merki",
+ "No replies found" : "Engin svör fundust",
"hasn't tooted yet" : "hefur ekki tíst neitt ennþá",
"Reply" : "Svara",
"Boost" : "Endurbirta",
@@ -68,9 +69,11 @@
"You are going to follow:" : "Þú ert að fara að fylgjast með:",
"name@domain of your federation account" : "nafn@lén á sambandstengda aðganginum þínum",
"Continue" : "Halda áfram",
+ "This step is needed as the user is probably not registered on the same server as you are. We will redirect you to your homeserver to follow this account." : "Þetta skref er nauðsynlegt þar sem notandinn er líklega ekki skráður á sama netþjóni og þú. Við endurbeinum þér á heimanetþjóninn þinn til að fylgja þessum aðgangi.",
"User not found" : "Notandi fannst ekki",
"Sorry, we could not find the account of {userId}" : "Því miður, við gátum ekki fundið notandaaðganginn {userId}",
"Nextcloud becomes part of the federated social networks!" : "Nextcloud verður hluti af samfélagsnetum í skýjasambandi!",
+ "We automatically created a Social account for you. Your Social ID is the same as your Federated Cloud ID:" : "Við útbjuggum sjálfvirkt samfélagsnetsaðgang fyrir þíg. Samfélagsnetsauðkennið þitt er það sama og skýjasambandsauðkennið þitt (Federated Cloud ID):",
"Since you are new to Social, start by following the official Nextcloud account so you don't miss any news" : "Þar sem þú ert nýr á samfélagsnetinu, byrjaðu þá á því að fylgjast með opinbera Nextcloud aðgangnum svo þú missir ekki af neinu fréttnæmu",
"Follow Nextcloud on mastodon.xyz" : "Fylgstu með Nextcloud á mastodon.xyz"
},"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"
diff --git a/l10n/mk.js b/l10n/mk.js
index 7fa3ae3a..a02822ae 100644
--- a/l10n/mk.js
+++ b/l10n/mk.js
@@ -6,8 +6,12 @@ OC.L10N.register(
"Finish setup" : "Заврши го подесувањето",
"Home" : "Дома",
"Notifications" : "Известувања",
+ "Profile" : "Профил",
"Public" : "Јавна",
+ "posts" : "објави",
+ "No results found" : "Нема пронајдено резултати",
"Reply" : "Одговор",
+ "Hello" : "Здраво",
"Close" : "Затвори",
"Continue" : "Продолжи",
"User not found" : "Корисникот не е пронајден"
diff --git a/l10n/mk.json b/l10n/mk.json
index 5495ae96..435c2534 100644
--- a/l10n/mk.json
+++ b/l10n/mk.json
@@ -4,8 +4,12 @@
"Finish setup" : "Зав