Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-27 01:20:16 +00:00
Code Issues Projects Releases Packages Wiki Activity
32663 commits 3 branches 64 tags 241 MiB
Commit graph

8527 commits

Author SHA1 Message Date
Michael
4236a9a105 Improved http error handling 2021-10-29 23:21:07 +00:00
Philipp
22663c4ae5
Move Introspection to Logger package 2021-10-29 12:37:22 +02:00
Philipp
f4ea74447e
Add Feedback :-) 2021-10-29 11:37:09 +02:00
Philipp
409d909d0f
Restructure HTTPClient for new paradigm 2021-10-28 20:01:03 +02:00
Philipp
fa55928ea3
Replace own VoidLogger with PSR-Standard NullLogger() 2021-10-28 20:01:03 +02:00
Philipp
184f6cc255
Restructure Logger to new paradigm 2021-10-28 20:01:02 +02:00
Philipp
d778af0b0e
Cleanup namespaces 2021-10-27 20:16:34 +02:00
Philipp
7c38647573
Cleanup namespace 2021-10-27 20:06:04 +02:00
Philipp
2ab0d06996
Restructure Storage to new paradigm 2021-10-27 20:00:19 +02:00
Hypolite Petovan
24f8ee8e67
Merge pull request #10918 from nupplaphil/feat/core_new_paradigm 
Paradigm Restructuring Part 1 - Core classes
 2021-10-27 13:45:40 -04:00
Tobias Diekershoff
2a0d3da070 fix link to media tab in navigation 
In #10904 the wrong link was set, this PR should fix it and really point towards the media tab of the profiles.
 2021-10-27 15:09:37 +02:00
Philipp
58eea1adaa
Cleanup namespaces 2021-10-26 22:11:10 +02:00
Philipp
b216317477
Refactoring Core class structures ... 2021-10-26 22:11:09 +02:00
Philipp
57b4c008cb
Restructure Session to follow new paradigm 2021-10-26 22:11:07 +02:00
Philipp
ff1a812e1a
Restructure Lock to follow new paradigm 2021-10-26 22:11:06 +02:00
Philipp
ab83d0dd27
Restructure (P)Config to follow new paradigm 2021-10-26 22:11:06 +02:00
Philipp
68046573a4
Restructure Cache to follow new paradigm 2021-10-26 22:11:06 +02:00
Michael
b2165cdf22 Speed up query for unused contacts 2021-10-26 20:06:18 +00:00
Hypolite Petovan
02e08d5fbc Use router parameters in Diaspora\Receive 2021-10-26 14:56:47 -04:00
Hypolite Petovan
8af86af3d9 Add new developer test console command 2021-10-26 11:42:22 -04:00
Michael
a0c1c3f661 Fix notice "Array to string conversion" 2021-10-25 20:54:36 +00:00
Michael Vogel
81c9d8d479
Apply suggestions from code review 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2021-10-25 21:27:21 +02:00
Michael
87673fd0c5 Merge remote-tracking branch 'upstream/develop' into logging 2021-10-25 18:56:29 +00:00
Michael Vogel
5dc283ba8d
Merge pull request #10917 from MrPetovan/bug/10914-event-feed-time 
Add event timezone in Model\Event::getHTML
 2021-10-25 06:33:20 +02:00
Hypolite Petovan
d1417d74bc Add timezone to event dates format in Model\Event::getHTML 
- Adds timezone information for user-less contexts like syndication feeds
 2021-10-24 23:17:55 -04:00
Hypolite Petovan
40aaa51050 Skip session authentication for backend modules 
- This was causing errors accessing these modules with an existing session with 2fa enabled while anonymous calls were going through
 2021-10-24 23:17:55 -04:00
Hypolite Petovan
c4fdc7466d Test item psid against PermissionSet::PUBLIC constant instead in ActivityPub\Objects 
- Address https://github.com/friendica/friendica/issues/10755#issuecomment-950393419
 2021-10-24 23:00:40 -04:00
Hypolite Petovan
bcd3cf0bc0
Merge pull request #10923 from nupplaphil/feat/error_handling 
Add extended ErrorHandling
 2021-10-24 22:41:38 -04:00
Philipp
8f688b2a89
Update ErrorHandler 2021-10-24 19:44:38 +02:00
Michael
7fd202dbc9 Handle invalid avatar pictures 2021-10-24 11:33:35 +00:00
Philipp
eacb584703 Fix PHP_NOTICE because of fsuggestion 2021-10-23 21:46:32 -04:00
Philipp
01659d731f Fix FSuggestselect 2021-10-23 21:46:04 -04:00
Philipp
8c9eb9a58d Fix FSuggestselect 2021-10-23 21:45:38 -04:00
Philipp
0d517b590d fetch new FSuggest after update 2021-10-23 21:45:38 -04:00
Philipp
92c7b99a4f Update src/Contact/FriendSuggest/Exception/FriendSuggestPersistenceException.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2021-10-23 21:45:38 -04:00
Philipp
74cfb32085 Update src/Contact/FriendSuggest/Exception/FriendSuggestNotFoundException.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2021-10-23 21:45:38 -04:00
Philipp
6623780cf8 Fix FSuggest conversation 2021-10-23 21:45:37 -04:00
Philipp
61839d503a Fix "Suggest a friend" text 2021-10-23 21:45:37 -04:00
Philipp
4a386b2f36 Add some missing Copyright header 2021-10-23 21:45:36 -04:00
Philipp
5d92713a8e Rename Depository to Repository 2021-10-23 21:45:36 -04:00
Philipp
b407fbedc1 Replace all 'fsuggest' usages with the new paradigm 2021-10-23 21:45:35 -04:00
Philipp
82a6c78033 Move FSuggest to depository 2021-10-23 21:45:35 -04:00
Philipp
acb06af28d
Add extended ErrorHandling 2021-10-23 20:58:38 +02:00
Michael
7ebf211ad2 Fixed indention 2021-10-23 17:23:11 +00:00
Michael
8185c591d8 New option to activate/deactivate contact avatar cache 2021-10-23 17:18:30 +00:00
Michael
a497bd3a3d Merge remote-tracking branch 'upstream/develop' into logging 2021-10-22 06:06:39 +00:00
Philipp
e0411743e2
Merge pull request #10913 from MrPetovan/bug/10903-profile-edit 
Add redirection to clear the owner cache after profile update
 2021-10-22 07:12:43 +02:00
Hypolite Petovan
cb86048b8a Add redirection to clear the owner cache after profile update 2021-10-21 19:11:28 -04:00
Hypolite Petovan
82c2a30c59 Fix wrong array access to Entity object 
- Address https://github.com/friendica/friendica/issues/10756#issuecomment-949051839
 2021-10-21 18:58:18 -04:00
Hypolite Petovan
096dacf0fd Manually expand ACLs coming from non-permissionset tables 
- Return early if parameter is empty in ACLFormatter->expand
- Address https://github.com/friendica/friendica/issues/10756#issuecomment-949049195
 2021-10-21 18:56:43 -04:00
Michael
17aa00bff8 Fix: Use correct condition to update the avatar 2021-10-21 17:19:41 -04:00
Philipp
1cb76d23ff
Delete the intro after confirming it ;-) 2021-10-21 22:18:32 +02:00
Philipp
e1574dc2e7
Fix foreign key violation for Notify insert with uri_id/parent_uri_id 0 instead NULL 2021-10-21 22:11:15 +02:00
Philipp
bf7c66b2c7
Fix Model\Contact\Introduction::confirm() 2021-10-21 21:57:25 +02:00
Philipp
f5786a8f4f
set intro::duplex deprecated because of no usage 2021-10-21 21:57:24 +02:00
Philipp
d67b676ce5
Fix confirm parameter 2021-10-21 21:57:24 +02:00
Philipp
3153e098b0
Remove deprecated, impossible code for discarding with FID 2021-10-21 21:57:24 +02:00
Philipp
44627a0b12
fix intro.cid and intro.suggest-id 2021-10-21 21:57:23 +02:00
Philipp
690369cc4b
Fixings & add tests 2021-10-21 21:56:46 +02:00
Philipp
ed184bd592
Set intro.blocked to deprecated 2021-10-21 21:56:46 +02:00
Philipp
bf0782dc6b
Rename setIgnore() to ignore() 2021-10-21 21:49:22 +02:00
Philipp
d2c210753a
Remove logging leftover for debugging 2021-10-21 21:49:21 +02:00
Philipp
7d7d310cc4
Replace almost every Introduction places 2021-10-21 21:49:21 +02:00
Philipp
a40f503fdd
Move Introduction to new depository paradigm 2021-10-21 21:49:20 +02:00
Hypolite Petovan
0cf4a74dfe
Merge pull request #10907 from annando/notice 
Avoid notice "Undefined property: Friendica\Util\Logger\StreamLogger::$DEBUG"
 2021-10-20 16:06:04 -04:00
Michael
f6faae5bb1 Replace deprecated log calls 2021-10-20 18:53:52 +00:00
Michael
e041b969fc Avoid notice "Undefined property: Friendica\Util\Logger\StreamLogger::$DEBUG" 2021-10-20 17:50:16 +00:00
Tobias Diekershoff
bc65f10190 replace the video entry in the Nav.php with media as well 2021-10-20 15:11:30 +02:00
Hypolite Petovan
353cd66b26
Merge pull request #10900 from annando/notify 
`enotify.php` is removed and its functions were transferred
 2021-10-19 22:22:41 -04:00
Philipp
7e433c66c1
RemoveContent fix column name 2021-10-19 23:34:36 +02:00
Michael Vogel
e2d2f42802
Merge pull request #10901 from nupplaphil/bug/notify_post 
Fix DB errors
 2021-10-19 22:43:11 +02:00
Philipp
88825c2520
Split contact-relation deletion 2021-10-19 22:35:57 +02:00
Philipp
b838b594cd
contact-relation - Fix DB error 2021-10-19 22:24:14 +02:00
Michael
2f1f6f6fb2 Replace "notification" call with new function, removing enotify.php 2021-10-19 19:45:36 +00:00
Michael
3781b34272 PROFILE_PHOTOS is mostly removed and replaced 2021-10-19 19:15:28 +00:00
Michael
4422be9cea Removing functionality from enotify.php 2021-10-19 19:09:53 +00:00
Michael
b152fde9d1 Don't degrade an existing relationship when following again 2021-10-19 02:05:04 +00:00
Philipp
bf224b58f8
Move to PermissionSet::isPublic() 2021-10-18 23:32:47 +02:00
Philipp
64a336ee8d
Rename method again 2021-10-18 23:32:46 +02:00
Philipp
b5d994394e
Fixing PUBLIC usage, Fixing DB-View, Creating tests 2021-10-18 23:32:45 +02:00
Philipp
a07acac463
Fix PHP-CS 2021-10-18 23:32:45 +02:00
Philipp
5fecc9ecf7
Adapt ProfileField & Fix current PermissionSet Usage at ProfileFields 2021-10-18 23:32:44 +02:00
Philipp
7c0c102f9f
Add tests 2021-10-18 23:32:42 +02:00
Philipp
f273c27e3b
Fixups 2021-10-18 23:32:42 +02:00
Philipp
7061e16b27
Add copyright 2021-10-18 23:32:41 +02:00
Philipp
838cdac5d1
Move ProfileFieldRepository::migrateFromLegacyProfile() & delete old repository 2021-10-18 23:32:41 +02:00
Philipp
f403851946
Move ProfileFieldRepository::updateCollectionFromForm() 2021-10-18 23:32:40 +02:00
Philipp
6f692b857b
Move ProfileField::selectByContactId() and ProfileField::selectByUserId() 2021-10-18 23:32:39 +02:00
Philipp
a9981c792e
Use ProfileField::selectPublicFieldsByUserId 2021-10-18 23:32:39 +02:00
Philipp
1c0f92c382
Move ProfileField from Model to Entity 2021-10-18 23:32:38 +02:00
Hypolite Petovan
39a927f213
Merge pull request #10891 from nupplaphil/bug/httpclientfactory_dbstructure 
Fix possible missing dbstructure.config.php in HTTPClientFactory.php
 2021-10-18 16:34:22 -04:00
Michael Vogel
df99ca8d82
Merge pull request #10888 from MrPetovan/task/10887-bbcode-style-block 
Add conditional block output for BBCode tag [style]
 2021-10-18 20:19:53 +02:00
Philipp
493b428991
require_once dbstructure.config.php for HTTPClientFactory.php in case we didn't load the DB 2021-10-18 19:36:56 +02:00
Michael Vogel
1dc613a0a1
Merge pull request #10889 from MrPetovan/task/10886-bbcode-remove-class 
Deprecate limited-use and potentially confusing [class] BBCode tag
 2021-10-18 19:28:07 +02:00
Hypolite Petovan
6f290607de
Merge pull request #10890 from xundeenergie/improve-links 
Improve links
 2021-10-18 09:08:48 -04:00
Hypolite Petovan
39aff642aa Deprecate limited-use and potentially confusing [class] BBCode tag 
- Replace its usage in Mastodon emoji with an internal tag [emoji]
 2021-10-18 02:45:42 -04:00
Jakobus Schürz (admin)
4aaa5a6a46 open provider-url in new tab 2021-10-18 08:41:45 +02:00
Jakobus Schürz (admin)
c450a7a757 open link from picture in new tab 2021-10-18 08:39:01 +02:00
Hypolite Petovan
4bee4818cf Add conditional block output for BBCode tag [style] 
- Move new line conversion to <br> tags
- Update BBCode help page
 2021-10-17 21:27:05 -04:00
Philipp
5d0b7fd87b
Merge pull request #10882 from MrPetovan/task/10865-contact-purge 
Add new purge contact content option to admin contact blocklist
 2021-10-17 23:44:28 +02:00
Michael
f1d3f60499 Remove "fcontact" from suggestions 2021-10-17 20:19:02 +00:00
Michael Vogel
b0bb95bb0d
Merge pull request #10880 from MrPetovan/bug/10876-profile-edit 
Account for the PUBLIC value for id parameter in Depository\PermissionSet::selectOneById
 2021-10-17 08:36:18 +02:00
Hypolite Petovan
aea07a7c15 Add new purge contact content option to admin contact blocklist 2021-10-16 19:29:38 -04:00
Hypolite Petovan
fc2175260f Move Worker task RemoveContact to Contact\Remove 2021-10-16 19:22:24 -04:00
Hypolite Petovan
efe0e45170 Create new Worker task to remove a contact's content from the database 2021-10-16 19:19:56 -04:00
Hypolite Petovan
f80478f262 Improve argument handling in Core\Worker::add 
- The argument name made it unclear the first argument is supposed to be a priority number
 2021-10-16 19:19:56 -04:00
Hypolite Petovan
45fc6759b8 Remove unused method in Model\\Contact 2021-10-16 16:05:09 -04:00
Hypolite Petovan
66c0431144 Switch available contact selection to private-supporting networks in ACL 2021-10-16 16:00:41 -04:00
Hypolite Petovan
ca2c73a2cd Account for the PUBLIC value for id parameter in Depository\PermissionSet::selectOneById 2021-10-16 15:42:21 -04:00
Hypolite Petovan
f9165fbaf0 Decode HTML entities in code blocks in HTML::toBBCode 
- Replace PHP_EOL uses with the more common \n
 2021-10-15 11:36:40 -04:00
Michael
c6021a45b1 Updated messages.po, keep a translatable string 2021-10-14 06:22:47 +00:00
Michael
a33185f835 Use a constant for the profile photo album 2021-10-14 04:12:00 +00:00
Hypolite Petovan
f05fecaec1
Merge pull request #10867 from annando/replace-p 
replace "p" with higher level database functions
 2021-10-13 19:33:59 -04:00
Michael
8d7846142d Hide blocked contacts when searching public contacts 2021-10-13 21:04:46 +00:00
martincodes
aa433f9d87 add condition to count accounts that arent removed 2021-10-13 18:54:22 +02:00
Michael Vogel
09771e1a76
Merge pull request #10870 from MrPetovan/bug/fatal-errors 
Use entity property in DB condition in Module\Profile\Status
 2021-10-13 07:19:26 +02:00
Michael
2904f4ca0e Olq query removed, checking for deleted as well 2021-10-13 05:11:36 +00:00
Hypolite Petovan
f622a541c3 Use entity property in DB condition in Module\Profile\Status 
- Address https://github.com/friendica/friendica/issues/10756#issuecomment-939538157
 2021-10-13 00:09:14 -04:00
Hypolite Petovan
2324dac4b2 Ignore max_id when it's 0 or less in BaseDepository->_selectByBoundaries 
- It can cause a conflict when both min_id and max_id = 0 as default values
 2021-10-12 21:18:32 -04:00
Hypolite Petovan
b3c576b9ce Fix request parameter mapping to selectByBoundaries() in Api\Mastodon\Notifications 2021-10-12 21:17:19 -04:00
Michael
27b9da3df5 replace "p" with higher level database functions 2021-10-12 05:53:29 +00:00
Hypolite Petovan
9b68364b86
Merge pull request #10863 from annando/photo-type 
New photo field "photo-type" as preparation for banners
 2021-10-11 13:52:28 -04:00
Michael
13827edd2c New photo field "photo-type" as preparation for banners 2021-10-11 14:21:10 +00:00
Hypolite Petovan
f05faf22a1
Merge pull request #10861 from annando/no-q 
Replace the legacy function "unavailableNetworks"
 2021-10-11 08:17:45 -04:00
Michael
86947b0997 Replace "p" with "select" 2021-10-11 06:25:04 +00:00
Michael
d3ebb3ac49 Added missing "break" 2021-10-11 05:51:18 +00:00
Michael
41dc6cea2b Replace the legacy function 2021-10-11 04:33:10 +00:00
Hypolite Petovan
a3e42a8c07
Merge pull request #10857 from annando/no-q 
`q` is now completely removed
 2021-10-10 23:40:28 -04:00
Michael
ee2b249d00 Empty comments removed 2021-10-10 05:38:49 +00:00
Michael
2c134c5229 q is now completely removed 2021-10-09 21:16:15 +00:00
Hypolite Petovan
ca2d0178fc Improve po2php transformation 
- Use Geekwright\Po for po file parsing to catch corner case with multi-line message
- Switch from risky double quoted strings to safer single quoted strings in the output file
 2021-10-09 15:46:58 -04:00
Philipp
58215e56c3
Merge pull request #10854 from MrPetovan/bug/10844-unfollow 
Replace remaining explicit network value checks by Protocol::supportsFollow calls
 2021-10-09 09:23:12 +02:00
Hypolite Petovan
b214470b1a Replace remaining explicit network value checks by Protocol::supportsFollow calls 2021-10-09 02:10:16 -04:00
Hypolite Petovan
5028258c3b Remove exception throwing on null protocol action result in Console\Contact 2021-10-09 02:09:49 -04:00
Hypolite Petovan
479458a389 Add missing parameters to Contact::block/unblock 2021-10-09 02:09:01 -04:00
Hypolite Petovan
880c2148c2 Fix overly strict return value for revokeFollow methods 2021-10-09 02:08:04 -04:00
Hypolite Petovan
201d728b9e Fix addon reloading 
- The wrong variable was used to uninstall/install addons, which led to absolutely nothing done
 2021-10-09 00:12:11 -04:00
Hypolite Petovan
80a8cd86c4
Merge pull request #10836 from nupplaphil/feat/depository_permissionset 
Migrate PermissionSet to Depository paradigm
 2021-10-08 09:39:39 -04:00
Philipp
93c44e6186
exception msg .. once again ;-) 2021-10-08 13:36:19 +02:00
Philipp
df8bd18673
Typo 2021-10-08 12:37:53 +02:00
Michael
a32c10b354 Simplifid query 2021-10-08 04:24:59 +00:00
Michael
3972fe62fe More replaced "q" calls 2021-10-08 04:10:45 +00:00
Philipp
f73e4adc44
Add explicit check for PermissionSet and ProfileField 2021-10-07 20:48:39 +02:00
Philipp
03164d00e8
Add feedback and tests 2021-10-07 19:53:39 +02:00
Philipp
9e6962eac6
Make php-cs happy :-) 2021-10-07 19:53:38 +02:00
Philipp
62eb16e9ad
Migrate PermissionSet to Depository paradigm 2021-10-07 19:53:38 +02:00
Hypolite Petovan
456ae169ab Fix overly strict return value for terminateFriendship methods 2021-10-06 20:18:44 -04:00
Michael
48f482665c Issue 10841: Redirect always to the same page 2021-10-06 19:02:26 +00:00
Hypolite Petovan
c0f03889c5 Pass correct hook data for support_follow and support_revoke_follow 2021-10-06 12:07:48 -04:00
Michael
ab17fbf6b2 Unneeded "ProxyUtils" renamed to "Proxy" 2021-10-05 20:18:19 +00:00
Hypolite Petovan
430e6c3285
Merge pull request #10834 from annando/legacy-reshare-removed 
The legacy reshare functionality is removed
 2021-10-05 15:19:15 -04:00
Michael
d20aa5f557 The legacy reshare functionality is removed 2021-10-05 18:58:35 +00:00
Philipp
7471b7698b
Adapt filesystem tests 2021-10-05 20:29:52 +02:00
Philipp
ccd8895237
Adress feedback :) 2021-10-05 20:07:14 +02:00
Philipp
065b46c721
Split Storage usage and Storage configuration 2021-10-05 20:07:12 +02:00
Michael Vogel
0509e8f37e
Update src/Module/Photo.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2021-10-04 21:17:22 +02:00
Michael Vogel
790875d8be
Apply suggestions from code review 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2021-10-04 21:06:13 +02:00
Michael
b2c2283817 separate parameter values for different functionalities 2021-10-04 18:04:41 +00:00
Michael
9eba41598d Code review changes 2021-10-04 14:01:46 +00:00
Michael
126aa6f148 Fix tests 2021-10-04 06:26:41 +00:00
Michael
43a17b6129 Merge remote-tracking branch 'upstream/develop' into photo-guid 2021-10-04 06:21:19 +00:00
Michael Vogel
c714595b70
Merge pull request #10821 from MrPetovan/bug/notices 
Relax check on id parameter in /photo
 2021-10-04 08:18:52 +02:00
Michael Vogel
2a8d8d402c
Merge pull request #10822 from MrPetovan/bug/fatal-errors 
Trim XML before emptiness check in Protocol\Feed::import
 2021-10-04 08:17:35 +02:00
Michael Vogel
6275159761
Merge pull request #10819 from MrPetovan/task/refactor-notifications 
Cast object parameters to string in Database\Database
 2021-10-04 08:16:58 +02:00
Michael
d30dc52101 Access contact avatars by guid 2021-10-04 06:13:52 +00:00
Hypolite Petovan
297ff76590 Relax check on id parameter in /photo 
- Address https://github.com/friendica/friendica/issues/10756#issuecomment-933020126
- Address https://github.com/friendica/friendica/issues/10755#issuecomment-933020316
 2021-10-03 20:59:47 -04:00
Hypolite Petovan
42e77e23ac Add logging to track a Notice messages 
- Part of https://github.com/friendica/friendica/issues/10755#issuecomment-933040517
 2021-10-03 20:59:41 -04:00
Hypolite Petovan
a4706e9521 Trim XML before emptiness check in Protocol\Feed::import 
- Address https://github.com/friendica/friendica/issues/10791
 2021-10-03 19:32:20 -04:00
Michael
1d86d79778 Merge remote-tracking branch 'upstream/develop' into more-q 2021-10-03 19:49:11 +00:00
Michael Vogel
caa1a5aeac
Merge pull request #10818 from MrPetovan/task/10691-remove-event-adjust 
Display the current timezone in date time picker fields
 2021-10-03 21:46:33 +02:00
Michael
b0bf4b4359 Some more "q" calls and deprecated logging replaced 2021-10-03 19:43:49 +00:00
Hypolite Petovan
24734b05fe Cast object parameters to string in Database\Database 
- This makes string casting in Depository->save unnecessary
 2021-10-03 15:35:47 -04:00
Hypolite Petovan
c40390c202 Revert "Explicitly cast Url objects to string" 
This reverts commit ee5aa2d432.
 2021-10-03 15:22:40 -04:00
Michael Vogel
dd3f573fec
Merge pull request #10817 from MrPetovan/task/refactor-notifications 
Explicitly cast Url objects to string
 2021-10-03 21:03:03 +02:00
Hypolite Petovan
ee5aa2d432 Explicitly cast Url objects to string 
- Some systems do not do this operation automatically and it results in empty DB fields
 2021-10-03 14:53:06 -04:00
Hypolite Petovan
a31a64827f Display the current timezone in date time picker fields 2021-10-03 13:42:32 -04:00
Hypolite Petovan
a9bb53b021 [frio] Fix event time display 2021-10-03 13:42:32 -04:00
Hypolite Petovan
9935e8e711 Remove event.adjust field 
- It was confusing and introduced complexity that wasn't worth the unclear gain
 2021-10-03 13:42:32 -04:00
Hypolite Petovan
6db211568a Remove most calls to date_default_timezone_* calls 
- It was wrongly used to set the node-wide ot user-specific timezone
- It is now fully managed from the App object
- Add a static variable to DateTimeFormat maintain the convenient local() method
 2021-10-03 13:42:31 -04:00
Tobias Diekershoff
08c24fd4fa
Merge pull request #10816 from MrPetovan/task/refactor-notifications 
Check if the string representation of Notify->link is empty in Module\Notifications\Notification
 2021-10-03 17:39:14 +02:00
Hypolite Petovan
e91ba2b992 Check if the string representation of Notify->link is empty in Module\Notifications\Notification 
- The property is a Url object which will always return true when tested for truthy value
 2021-10-03 11:34:23 -04:00
Michael
6668591afe Merge remote-tracking branch 'upstream/develop' into more-q 2021-10-03 15:06:31 +00:00
Michael
763e264196 More "q" calls have been replaced 2021-10-03 15:02:20 +00:00
Michael Vogel
3d97149007
Merge pull request #10722 from MrPetovan/task/refactor-notifications 
Move notify, notifications and introduction notifications to new paradigm
 2021-10-03 14:13:28 +02:00
Hypolite Petovan
c84d4104e8 Add missing Module\Photo route for post-media id with no customsize 2021-10-03 07:58:52 -04:00
Hypolite Petovan
5112dd06f2 Add missing Module\Photo route for contact avatar 2021-10-03 07:48:46 -04:00
Michael
9961943b73 Code Style: Replace "AS" with "as" 2021-10-03 10:34:41 +00:00
Hypolite Petovan
c1ab3801ba Replace remaining reference to Model\Photo::stripExtension 2021-10-03 05:52:53 -04:00
Michael
42790fbc1f Don't store emoji images as media but links 2021-10-03 09:42:14 +00:00
Hypolite Petovan
8cb0bb5deb Switch uid with nickname in user picture URLs 
- Keep previous URL scheme fallback as remote contact avatar URLs pointing to local user avatar URLs need to update
 2021-10-02 19:06:59 -04:00
Hypolite Petovan
7cdd2d1336 Refactor User::getAvatarUrlForId into getAvatarUrl 
- Use user/owner array as parameter instead of uid
- Rename $profile variables to $owner when it's the result of User::getOwnerDataByNick
- Replace Module\Photo::stripExtension with native pathinfo() calls
 2021-10-02 19:06:25 -04:00
Hypolite Petovan
4f42522ebc Simplify Depository\Notify->selectAllForUser parameters 
- Shifts database structure knowledge from the controller to the depository where it should be
 2021-10-02 18:15:45 -04:00
Hypolite Petovan
8a1a2f658c Create new DI shorthands for notification-related factories 2021-10-02 18:15:45 -04:00
Hypolite Petovan
7a2d5f6a8e Move notification to the new paradigm 2021-10-02 18:15:45 -04:00
Hypolite Petovan
bc0734e0f1 Move notification introductions to the new paradigm 2021-10-02 18:15:45 -04:00
Hypolite Petovan
43e5b317ed Add new paradigm classes for notification and introduction notifications 
- Add support for bounded select in BaseDepository
 2021-10-02 18:15:44 -04:00
Hypolite Petovan
3e6fea30f2 Create constants for Mastodon notification types 2021-10-02 18:15:44 -04:00
Hypolite Petovan
ea6f7aba40 Fix method name typos in Model\Post\UserNotification 
- Reformat file, improve type-hinting
 2021-10-02 18:15:43 -04:00
Hypolite Petovan
dae5703e5c Improve accuracy of accepted parameter types in phpDoc of Database->fetch 
- Suppresses an unwarranted type error raised by static analyzers
 2021-10-02 18:15:43 -04:00
Hypolite Petovan
bf81f21001 Rename Model\Post\UserNotifications type constants 2021-10-02 18:15:43 -04:00
Hypolite Petovan
47acb6a278 Move notify to the new paradigm 
- Remove unused frion notify template
- Update API test
 2021-10-02 18:15:42 -04:00
Hypolite Petovan
1b4e3564a5 Add new paradigm classes for notify 
- Create BaseDepository class
- Create Entity, Collection, Factory and Depository classes
- Create FormattedNotification Entity, Collection and Factory to remove business logic from Notify repository
- Create new NotificationCreationIntercepted exception to allow addons to cancel notification creation
- Remove unused frio notifications/notify.tpl template
 2021-10-02 18:15:34 -04:00
Hypolite Petovan
810699b454
Merge pull request #10803 from nupplaphil/feat/message_log 
Forgot one Logpoint ..
 2021-10-02 17:41:34 -04:00
Hypolite Petovan
ce7d394ff9
Merge pull request #10801 from annando/network-thread-view 
Fixing "Unknown column 'network-thread-view.uri-id'"
 2021-10-02 17:40:00 -04:00
Michael Vogel
2a442952b6
Merge pull request #10800 from MrPetovan/task/10739-block 
Add block and unblock hooks
 2021-10-02 23:39:06 +02:00
Hypolite Petovan
66fec8944f Add block and unblock hooks 2021-10-02 17:30:40 -04:00
Hypolite Petovan
bd42f5757f Implement relationship termination for Mastodon block 
- This is the expected Mastodon behavior on block
 2021-10-02 17:30:07 -04:00
Hypolite Petovan
b0d8136b00 Remove contact record instead of setting rel = 0 in Contact::revokeFollow 2021-10-02 17:30:03 -04:00
Philipp
254c32ac91
Forgot one Logpoint .. 2021-10-02 23:27:15 +02:00
Michael Vogel
fc9ac0ff46
Update src/Module/Conversation/Network.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2021-10-02 23:18:54 +02:00
Philipp
80753ed1b6
Remove disturbing/superfluous logging messages 2021-10-02 23:11:33 +02:00
Michael
eea355ae3b Merge remote-tracking branch 'upstream/develop' into network-thread-view 2021-10-02 21:00:10 +00:00
Michael
bd85babc3e Fixing "Unknown column 'network-thread-view.uri-id'" 2021-10-02 20:56:11 +00:00
Hypolite Petovan
c4a4473cd0 Remove the obsolete parameter $two_way from terminateFriendship methods 
- Follow revokation is now done independently
 2021-10-02 16:14:22 -04:00
Hypolite Petovan
222333f64f Remove contact drop feature 
- Feature was confusing, sometimes ineffective and overall overlapping with unfollow/block
 2021-10-02 16:04:28 -04:00
Michael
1550c0cf13 Reverted unneeded changes 2021-10-02 19:33:51 +00:00
Michael
afa611bd50 The media class moved 2021-10-02 19:31:27 +00:00
Michael
da3fbced38 Merge branch 'contact-media' of github.com:annando/friendica into contact-media 2021-10-02 18:35:47 +00:00
Michael
2408ac8227 Merge remote-tracking branch 'upstream/develop' into contact-media 2021-10-02 18:35:43 +00:00
Michael Vogel
a2f5190bdb
Update src/Model/Contact.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2021-10-02 20:31:30 +02:00
Hypolite Petovan
72fae04e97 Add revoke follow feature 
- Add new follow revoke module
- Add new hooks: revoke_follow, support_follow, support_revoke_follow
- Add link in contact page action menu
 2021-10-02 14:01:46 -04:00
Hypolite Petovan
9918fa3ec0 Move translation strings in their own array for confirm templates 2021-10-02 13:52:54 -04:00
Hypolite Petovan
e6aef548fb ActivityPub: Update relation when receiving a follow reject message 2021-10-02 13:52:54 -04:00
Michael
c822cdaebd Removing "blubb" 2021-10-02 17:47:11 +00:00
Tobias Diekershoff
8dc4499bcf
Merge pull request #10797 from annando/diaspora-deprecated 
Replaced deprecated code from the Diaspora implementation
 2021-10-02 19:19:40 +02:00
Michael
e5ffda3478 Replaced deprecated code from the Diaspora implementation 2021-10-02 17:11:54 +00:00
Michael
a44d200c21 Merge remote-tracking branch 'upstream/develop' into contact-media 2021-10-02 15:13:55 +00:00
Michael
c3554ac0f4 "Video" is replaced by a "Media" tab in contact and profile 2021-10-02 15:09:43 +00:00
Hypolite Petovan
797391e1d8 Rework contact termination to separate protocol-level and contact-level 
- Mail and Feed contacts are now removed automatically on relationship termination
- Added logging and notice messages for different results
 2021-10-02 08:31:59 -04:00
Michael
865006682a Merge remote-tracking branch 'upstream/develop' into user-contact 2021-10-02 11:57:43 +00:00
Michael
1979b4775d New functionality to display media posted by a contact 2021-10-02 11:55:22 +00:00
Hypolite Petovan
de2352e34d
Merge pull request #10794 from annando/q-removed 
"q" call is replaced
 2021-10-02 07:44:33 -04:00
Michael
666cff7d55 "q" call is replaced 2021-10-02 11:08:12 +00:00
Michael
f1e2ceb32c Issue 10747: Improved check for blocked domains 2021-10-02 10:25:50 +00:00
Hypolite Petovan
dae3e7d4c7
Merge pull request #10787 from fabrixxm/issue/10767 
Mark string translatable in View logs
 2021-10-01 11:08:11 -04:00
fabrixxm
e8c0d5d445 Logs view: remove unneeded tpl var 2021-10-01 17:00:06 +02:00
fabrixxm
0638e23f7a Mark string translatable in View logs 
and update messages.po
 2021-10-01 16:46:55 +02:00
Tobias Diekershoff
3727be9d6c
Merge pull request #10786 from annando/sanitize-addon-author 
Sanitize the addon author if it is not a valid URL but a handle
 2021-10-01 15:30:30 +02:00
Michael
19d5987c9d Sanitize the addon author if it is not a valid URL but a handle 2021-10-01 13:25:00 +00:00
Tobias Diekershoff
786596fec5 remove superfluous characters from warning messages in the admin panel 
\r\n was shown in the warning messages of the admin panel log view page. They have
been removed. Additionally the messages.po file has been regenerated.
 2021-10-01 14:02:27 +02:00
Hypolite Petovan
d9cd2f5bca
Merge pull request #10773 from annando/issue-10772 
Issue 10772: Avoid duplicated links in AP posts
 2021-09-28 07:03:39 -04:00
Michael
5a7bd4884a Issue 10772: Avoid duplicated links in AP posts 2021-09-27 20:26:08 +00:00
fabrixxm
eadcc8dc93 Handle reading empty file in ReversedFileReader 
fix #10766
 2021-09-27 12:14:19 +02:00
Michael
e4b8536c75 Removing MySQL workaround 2021-09-26 18:30:44 +00:00
Michael
f26226229a Issue 10768: Avoid MySQL problems when upgrading both index and structure 2021-09-26 17:13:26 +00:00
Hypolite Petovan
2a88262732
Merge pull request #10760 from annando/conversation-moved 
The conversation functionality moved to a class
 2021-09-26 10:03:26 -04:00
Michael
1bb25de287 Applied change from PR #10763 2021-09-26 12:17:30 +00:00
Hypolite Petovan
0bb169b4ed Check for reply existence before using its values in Model\Mail 
- Address https://github.com/friendica/friendica/issues/10474#issuecomment-925263894
 2021-09-26 08:15:07 -04:00
Hypolite Petovan
9d77958247 Ensure parent exists before adding reply to elements in OStatus and Feed 
- Address https://github.com/friendica/friendica/issues/10474#issuecomment-927118628
 2021-09-26 08:15:07 -04:00
Michael
e08c5ca2e0 Another try ... 2021-09-26 04:16:21 +00:00
Michael
1e583b4f35 Space removed 2021-09-26 04:07:02 +00:00
Michael
171cbf0512 Removed spaces 2021-09-26 04:05:46 +00:00
Michael
96055cafff Merge remote-tracking branch 'upstream/develop' into conversation-moved 2021-09-26 03:57:31 +00:00
Michael
a2532ad755 Merge remote-tracking branch 'upstream/develop' into user-contact 2021-09-26 03:07:59 +00:00
Hypolite Petovan
d8febbe45e Add new hook to support unfollow contacts on non-native networks 2021-09-25 16:15:06 -04:00
Michael
1f96742695 Merge remote-tracking branch 'upstream/develop' into conversation-moved 2021-09-25 18:38:50 +00:00
Michael
3fddf3807a Merge remote-tracking branch 'upstream/develop' into user-contact 2021-09-25 18:34:55 +00:00
Michael
d4fd151227 Partly reverting formatting to cause a code style checker error 2021-09-25 08:06:38 +00:00
Michael
5cfb0cb58a Last style stuff ... 2021-09-24 04:52:34 +00:00
Michael
943f1961ea Style again 2021-09-24 04:50:47 +00:00
Michael
8fd8241797 Style again 2021-09-24 04:46:30 +00:00
Michael
64d181c1cc Code style 2021-09-24 04:35:27 +00:00
Michael
f696fce824 Reformatting 2021-09-23 21:53:52 +00:00
Michael
26fa5e8b3f Moved functions 2021-09-23 21:29:36 +00:00
Michael
0ad904c185 The conversation functionality moved to a class 2021-09-23 21:18:36 +00:00
Hypolite Petovan
7f7f0eb10c Improve compacting error logging in Util\JsonLD 
- Exceptions thrown by friendica/json-ld are nested and their string representation shows all the exception chain
 2021-09-22 23:09:46 -04:00
Michael
840d9823d4 Log unexpected value 2021-09-22 03:25:01 +00:00
Michael
7ac76639c5 AVoid warning when fetching page data 2021-09-22 02:41:24 +00:00
Hypolite Petovan
be3fb5f205
Merge pull request #10730 from annando/public-contact-list 
Display the public contacts for profile visitors
 2021-09-19 17:32:51 -04:00
Michael
325342a886 Renamed variable 2021-09-19 17:56:44 +00:00
Michael
9c73e49db7 Make posts on the profile page writable 2021-09-19 10:53:19 +00:00
Michael
f032f66b38 Display the public contacts for profile visitors 2021-09-19 10:06:42 +00:00
Michael
3dddea96fa Merge remote-tracking branch 'upstream/2021.09-rc' into user-contact 2021-09-18 20:27:24 +00:00
Hypolite Petovan
24ecf5954c
Merge pull request #10721 from annando/issue-10720-avatar 
Issue 10720: Use different path scheme for user avatars
 2021-09-18 09:30:08 -04:00
Philipp
c00da77c67
Add feedback 2021-09-18 12:55:17 +02:00
Philipp
fd22906d70
Add feedback 2021-09-18 12:51:10 +02:00
Philipp
6893e2c3f7
Add feedback / revert fix for $item['post-type'] 2021-09-18 12:51:09 +02:00
Philipp
462f76352e
Add feedback :-) 2021-09-18 12:51:09 +02:00
Philipp
89a085a12c
Check DBA::count() result 2021-09-18 12:51:08 +02:00
Philipp
644f312896
Fix various Notices 2021-09-18 12:51:06 +02:00
Michael
a91e3f5dbc Issue 10720: Use different path scheme for user avatars 2021-09-17 18:36:20 +00:00
Hypolite Petovan
9a0c3cc834 Simplify max_data parameter for Temporal::getDateTimeField 2021-09-15 15:56:44 -04:00
Michael Vogel
695df7507a
Merge pull request #10713 from MrPetovan/task/10672-contact-module-security-token 
Use CSRF token as name and value for contact deletion confirm form
 2021-09-15 07:55:34 +02:00
Hypolite Petovan
44ec4de14c Use CSRF token as name and value for contact deletion confirm form 2021-09-14 17:28:42 -04:00
Michael Vogel
a689db7b64
Update src/Protocol/ActivityPub.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2021-09-14 23:22:57 +02:00
Michael
b18f92ea72 Fixed indendation 2021-09-14 20:46:59 +00:00
Michael
f99c4ca704 Removing unused variable 2021-09-14 08:08:50 +00:00
Michael
72fa4e9970 Better handling of displaying peertube videos 2021-09-14 07:52:53 +00:00
Michael
d33fea1993 Fix: Use the $uid 2021-09-14 02:00:40 +00:00
Michael
e3413cf959 Issue 10706: Publish public custom fields in AP 2021-09-14 01:28:58 +00:00
Michael
2926282f8d More fields added to "user-contact" 2021-09-13 14:20:20 +00:00
Michael
5abc1543fd Merge remote-tracking branch 'upstream/2021.09-rc' into user-contact 2021-09-13 12:31:30 +00:00
Hypolite Petovan
d78661817e
Merge pull request #10693 from nupplaphil/feat/config_dir 
Add the possibility to use a different configuration directory
 2021-09-13 07:02:52 -04:00
Philipp
a65fbcebe7
Fixing #10699 (prohibits blocking and ignoreing from the photo menu) 2021-09-12 21:20:12 +02:00
Michael
3eea4b1130 Use "rel" for "self" instead of using a separate field 2021-09-12 19:04:27 +00:00
Michael
19c3e55ca8 Merge remote-tracking branch 'upstream/2021.09-rc' into user-contact 2021-09-12 12:36:04 +00:00
Philipp
27e4586597
Move path determination logic into the ConfigFactory 2021-09-12 13:44:29 +02:00
Michael Vogel
5246b9c4b0
Merge pull request #10697 from MrPetovan/bug/10692-api-expand-entities 
Prevent expandTags to be performed on existing links in Module\Api\Mastodon\Statuses
 2021-09-12 06:47:51 +02:00
Hypolite Petovan
e3a2f17f9f
Merge pull request #10696 from annando/photo-type 
Use post type "photo" for multiple photos as well
 2021-09-12 00:19:47 -04:00
Hypolite Petovan
8e99b7f775 Refine BBCode::expandTags regular expression 
- Now requires the tag to be preceded by either a non-word character or a start of a line
- Added corresponding tests
 2021-09-12 00:06:14 -04:00
Hypolite Petovan
5a93bb6eff Prevent expandTags to be performed on existing links in Module\Api\Mastodon\Statuses 
- We never need to expand tags inside of an already existing BBCode url tag
 2021-09-12 00:05:22 -04:00
Michael
6579a3a106 Use post type "photo" for multiple photos as well 2021-09-12 01:58:29 +00:00
Michael
9191daf12f Fix commenting on public posts 2021-09-12 01:52:10 +00:00
Michael
eeec6aaeb9 Removed unused "use" 2021-09-11 13:02:36 +00:00
Michael
1e123ace12 Only fetch, not probe 2021-09-11 13:00:12 +00:00
Michael
10cb52bc00 Only add user contacts, alternate way to fetch public contact id 2021-09-11 12:43:46 +00:00
Philipp
5702944116
Add the possibility to use a different configuration directory 2021-09-11 14:33:26 +02:00
Michael
5113987031 Added update function to add user-contact entry 2021-09-11 07:59:46 +00:00
Michael
f33a98578d Capitalization 2021-09-10 23:59:33 +00:00
Michael
b170dd765d Insert and update some more fields 2021-09-10 20:53:10 +00:00
Michael
2486c8031b update for user-contact is added 2021-09-10 20:22:24 +00:00
Michael
9c14eb0c6b Use centralized function to update contact entries 2021-09-10 18:21:19 +00:00
Hypolite Petovan
8b450be09b Move unsecured GET endpoint handlers before security token check in Module\Contact 2021-09-10 12:05:43 -04:00
Hypolite Petovan
75d3f5094b
Merge pull request #10683 from annando/proxify 
Make the proxy functionality optional
 2021-09-10 10:24:17 -04:00
Michael
a4b0ab90b1 Insert a user-contact for every contact 2021-09-10 13:05:16 +00:00
Michael
634db1ec85 Changed text 2021-09-10 00:30:11 +00:00
Michael
bdb5aa6bd9 Make the proxy functionality optional 2021-09-09 12:40:19 +00:00
Hypolite Petovan
e9aa27b19f Add form security token to contact actions 
- Add token to batch POST actions
- Add token to individual GET actions
 2021-09-06 12:30:38 -04:00
Hypolite Petovan
d20b53607d Distinguish between public and private contact in contact actions 
- Block and ignore is done relating to a public contact (uid = 0)
- Update and drop is done relating to a private contact (uid !=0)
- Method documentation has been improved to precise the contact type it needs
- Public and private contact ids are retrieved before acting on contacts
 2021-09-06 11:50:46 -04:00
Hypolite Petovan
5262843e63 Add redirect URL parameter to contact batch 
- This allows redirection to the correct contact tab after a batch action
 2021-09-05 14:54:51 -04:00
Hypolite Petovan
6e358bfacf Remove user-controlled contact archival feature 
- Archival is managed at the system level for failed probing and doesn't make sense for a user to decide on it
 2021-09-05 14:54:50 -04:00
Hypolite Petovan
7ee88c3457 Improve documentation of $old_fields possible values in DBA::update and Database->update 2021-09-05 14:54:50 -04:00
Hypolite Petovan
bd09f5f665
Merge pull request #10669 from annando/no-rino 
Remove all traces of "rino"
 2021-09-05 14:53:46 -04:00
Michael
52ca3e5417 Remove all traces of "rino" 2021-09-05 18:34:44 +00:00
Philipp
fc46744183
Fix Photo::delete() 2021-09-05 19:20:43 +02:00
Michael
d89f004a2a Issue 10651: Improved logging 2021-09-04 04:51:20 +00:00
Michael
ce6f6978bd Use the correct function is adviced ... 2021-09-03 04:20:32 +00:00
Michael
307cfef12b Select all fields 2021-09-03 04:09:02 +00:00
Michael
6bb8b63da0 Adding gravity to avoid notices 2021-09-03 04:05:29 +00:00
Hypolite Petovan
1852ea98cf
Merge pull request #10657 from annando/self-unfollow 
Don't offer to unfollow yourself
 2021-09-02 20:04:16 -04:00
Hypolite Petovan
4140a59332
Merge pull request #10658 from nupplaphil/feat/storage_naming 
Rename Storage Backend labels
 2021-09-02 19:55:15 -04:00
Philipp
687e6841bc
Rename Storage Backend labels 2021-09-02 23:27:35 +02:00
Michael
547a13661a Don't offer to unfollow yourself 2021-09-02 19:38:10 +00:00
Michael
64fd94fc74 Issue 10651: remote comments appeared as own posts 2021-09-02 05:57:50 +00:00
Michael
58abaf5c53 Merge remote-tracking branch 'upstream/2021.09-rc' into issue-10640-c 2021-09-01 18:34:24 +00:00
Michael
c8d2c87af0 Issue 10640 - Inverse user display settings 2021-09-01 18:29:45 +00:00
Philipp
728e82d8b0
Improve translation for Storage module 2021-09-01 14:00:23 +02:00
Hypolite Petovan
1665b54c6f
Fix variable assignment alignment in Module\Admin\Site 2021-08-31 16:01:20 -04:00
Michael
13ae96e9e1 Some more "enable" 2021-08-31 19:54:05 +00:00
Michael
85e2328b23 Issue 10640: Some more inversed settings 2021-08-31 19:26:17 +00:00
Michael
80b13ec232 Fix translations for singular/plural strings 2021-08-31 05:51:08 +00:00
Michael
3944e5d38e Disable mail setting when imap support is disabled 2021-08-30 21:17:03 +00:00
Michael
e3c7cd25e1 Issue 10640: Use consistent settings to enable protocol support 2021-08-30 19:46:10 +00:00
Michael
2bae4dde1f Avoid notices 2021-08-30 12:29:09 +00:00
Hypolite Petovan
4f7142198e
Merge pull request #10642 from annando/url-change 
Set contact to failed when url changed
 2021-08-30 08:12:10 -04:00
Michael
9135ff5124 Set contact to failed when url changed 2021-08-29 20:25:21 +00:00
Philipp
0d6884a8a9
Fix http_code usage in case of failures 2021-08-29 14:05:38 +02:00
Philipp
58001c729f
Fix https://github.com/friendica/friendica/issues/10473#issuecomment-907749093 2021-08-29 13:56:56 +02:00
Philipp
b76634ea0c
Catch TransferExceptions for HTTPClient::finalUrl() in case the headers are empty 2021-08-29 13:37:08 +02:00
Philipp
1c089e8d89
[WIP] WebDav Storage backend 2021-08-25 23:47:18 +02:00