Hank Grabowski
614ad32f71
Merge branch 'develop' into mastodon-timeline-temporal-paging
2023-02-22 13:26:51 -05:00
Hank Grabowski
a301f8a82d
Merge branch 'develop' into fix-blocks-ignores-in-full-context-status-request
2023-02-22 13:26:28 -05:00
Hank Grabowski
7224c0fc38
Merge branch 'develop' into blocks-status-fix
2023-02-22 12:08:06 -05:00
Hank Grabowski
4a00731aa4
Breakup public/user ID query results so can always query blocked status by CID
2023-02-22 12:07:57 -05:00
Hank Grabowski
b06a3e877e
Add show_all option to Mastodon status context to show ignored and blocked statuses
2023-02-22 11:45:42 -05:00
Hank Grabowski
a67fe069e8
Add order/limit building func and fix reverse order requirement on min_id
2023-02-22 11:27:54 -05:00
Hank Grabowski
9c5f3ae58f
Simply Timeline Home temporal endpoint to reuse min_id and max_id
2023-02-22 11:02:52 -05:00
Michael
08ba9e4183
Fix emoji activities
2023-02-21 21:07:41 +00:00
Hank Grabowski
818075d039
Implement time based paging for Mastodon Home Timeline Endpoint
2023-02-21 15:37:32 -05:00
Hank Grabowski
3958739d60
Add to Mastodon Status/Context filter for ignored and blocked user's comments
2023-02-21 13:53:16 -05:00
Hypolite Petovan
5acbcba5c2
Merge pull request #12829 from Quix0r/fixes/export-to-file-null
...
Fixed: DomainPatternBlocklist::exportToFile() must be of the type string, null given
2023-02-21 09:13:19 -05:00
Roland Häder
ed86e9ca96
Fixed:
...
- added check for empty file name as the export doesn't work without one:
`[Error] Argument 1 passed to Friendica\Moderation\DomainPatternBlocklist::exportToFile() must be of the type string, null given, called in /var/www/.../src/Console/ServerBlock.php on line 110`
2023-02-21 12:58:50 +01:00
Hank Grabowski
9c9abd4400
Merge branch 'develop' into dislike-for-mastodon-endpoints
2023-02-20 15:52:09 -05:00
Hank Grabowski
155e3a701e
Add DislikedBy Mastodon compatible endpoint in the Friendica API space
2023-02-20 15:51:17 -05:00
Hank Grabowski
c419aabee4
Add deleted check to FavouritedBy Mastodon endpoint
2023-02-20 15:50:21 -05:00
Hank Grabowski
c235bf299e
Add Mastodon format compatible (un)dislike endpoint in Friendica API space
2023-02-20 15:33:36 -05:00
Hank Grabowski
dba74c7940
Fix phpcbf style errors in part of code I didn't change
2023-02-20 15:32:03 -05:00
Hank Grabowski
3a8929be1f
Add dislike counts to Mastodon API Statuses in FriendicaExtension
2023-02-20 15:31:15 -05:00
Hypolite Petovan
dec5a40aac
Merge pull request #12818 from HankG/mastodon-instance-v2-implementation
...
Mastodon instance v2 implementation
2023-02-20 14:16:17 -05:00
Hank Grabowski
6cd271b10f
Modify to use the new baseURL methods.
2023-02-20 13:33:13 -05:00
Hank Grabowski
06f53d2d1a
Add missing spaces after colons for function parameters for style check reasons
2023-02-20 13:31:04 -05:00
Hank Grabowski
5c3bd4acd1
Merge branch 'develop' into mastodon-instance-v2-implementation
2023-02-20 13:25:59 -05:00
Hank Grabowski
dd664f632f
Merge branch 'develop' into fix-blocks-listing
2023-02-20 13:25:05 -05:00
Hank Grabowski
41b5ec0262
Merge branch 'develop' into mastodon-instance-v2-implementation
2023-02-20 13:22:37 -05:00
Hank Grabowski
71a7c0a4de
Refactor Mastodon API InstanceV2 so objects are simple and BI in API layer
2023-02-20 13:22:29 -05:00
Philipp
3de3d867a5
Merge pull request #12821 from HankG/notifications-summary
...
Add Notifications summary poption to Mastodon API Endpoint
2023-02-20 18:36:38 +01:00
Hank Grabowski
b3226e11ac
Merge branch 'develop' into blocks-and-mutes-fixes
2023-02-20 12:27:25 -05:00
Hank Grabowski
97cad5d2e0
Merge branch 'develop' into fix-blocks-listing
2023-02-20 12:19:56 -05:00
Hypolite Petovan
33a8d2bc3d
Merge pull request #12814 from nupplaphil/bug/config_multi_serialize
...
Fix multiple serialized values
2023-02-20 11:54:18 -05:00
Hypolite Petovan
14a3f73f4f
Merge pull request #12823 from annando/optimize
...
Config to enable the optimizing of all tables
2023-02-20 11:53:30 -05:00
Philipp
41251458a0
language and static
2023-02-20 17:23:01 +01:00
Philipp
d772331b91
Fix multiple serialized values
2023-02-20 17:22:59 +01:00
Michael Vogel
7560939d75
Merge pull request #12820 from MrPetovan/bug/fatal-errors
...
Remove reference to remove field in event table
2023-02-20 16:37:45 +01:00
Hank Grabowski
f5ffc9da95
Remove extraneous ID parameter from Mastodon Blocks Listing API
2023-02-20 10:18:15 -05:00
Hank Grabowski
843502badc
Merge branch 'develop' into notifications-summary
2023-02-20 10:06:59 -05:00
Michael
bd0348b53c
Config to enable the optimizing of all tables
2023-02-20 14:46:58 +00:00
Hank Grabowski
4abb7ed746
Fix whitespace issue on assignment alignment
2023-02-20 09:07:50 -05:00
Hank Grabowski
e594bb72dd
Add notifications summary (count only for now) to Mastodon API
2023-02-20 08:53:28 -05:00
Hypolite Petovan
cef063e4fd
Merge pull request #12819 from HankG/add-tables-to-optimize
...
Add tables to Optimize Worker
2023-02-20 08:47:38 -05:00
Hypolite Petovan
ee5acc29c3
Merge pull request #12802 from nupplaphil/feat/system_url_handling
...
Transform BaseURL to URIInterface conform class with less business logic
2023-02-20 08:43:00 -05:00
Hypolite Petovan
6106b8b75e
Merge pull request #12813 from HankG/mastodon-status-post-with-title
...
Add Friendica Title Extension to Mastodon Statuses POST API
2023-02-20 08:27:54 -05:00
Hypolite Petovan
65cd493431
Merge pull request #12807 from HankG/mastodon-trending-api-updates
...
Mastodon trending api updates
2023-02-20 08:27:42 -05:00
Hypolite Petovan
5bba6dd4b7
Merge pull request #12804 from HankG/fix-blocked-users-in-mastodon-api-timelines
...
Add Block/Ignore filtering on all Mastodon API Timeline endpoints
2023-02-20 08:27:33 -05:00
Hypolite Petovan
0dbee1c4d2
Remove reference to remove field in event table
...
- Address https://anonsys.net/display/bf69967c-1663-f368-5a52-cdd110992529
2023-02-20 08:26:23 -05:00
Hank Grabowski
0bb2d00e70
Add License header to FriendicaExtensions file
2023-02-20 08:05:46 -05:00
Hank Grabowski
fcf59dc245
Fix binary_operator_spaces errors
2023-02-20 08:05:01 -05:00
Hank Grabowski
c076a07404
Add back in accidentally removed Session table
2023-02-20 07:55:41 -05:00
Hank Grabowski
0451f2dfa1
Add Mastodon Instance V2 API endpoint /api/v2/instance
2023-02-20 07:51:20 -05:00
Michael
3b469fe4e9
Fix the spelling of some verbs
2023-02-20 08:54:27 +00:00
Michael
11513519ce
Config option to process the "view" activity
2023-02-20 06:41:28 +00:00
Hank Grabowski
8101739edd
Change Mastodon API documentation URL for V1 Instance type
2023-02-19 17:32:13 -05:00
Hank Grabowski
7ea09e666b
Add additional tables to the optimize worker function
2023-02-19 08:55:08 -05:00
Hank Grabowski
cd957a7f66
Remove extraneous __get since needed capability found in parent class
2023-02-19 07:59:53 -05:00
Hank Grabowski
3bb0bda880
Remove documentation stating friendica extensions can be null since always set
2023-02-19 07:58:10 -05:00
Hank G
f1dbf82e5b
Update src/Module/Api/Mastodon/Statuses.php
...
Co-authored-by: Philipp <admin+Github@philipp.info>
2023-02-19 07:50:39 -05:00
Philipp
cb106f40ca
Remove $ssl_state variable
2023-02-19 12:25:24 +01:00
Philipp
f9f86e04ff
adapt BaseURL constructor
2023-02-19 11:27:14 +01:00
Philipp
3e0efc9c7c
Update src/Module/Moderation/Users/Blocked.php
...
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2023-02-19 11:27:02 +01:00
Philipp
94d1e0b232
Apply suggestions from code review
...
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2023-02-19 11:26:26 +01:00
Philipp
544168244c
Apply suggestions from code review
...
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2023-02-19 11:12:48 +01:00
Philipp
75ecaa89ee
Add site admin warning if BaseURL is missing
2023-02-18 21:50:07 +01:00
Philipp
c0359330b6
Add typehint for DI::baseUrl()
2023-02-18 21:12:21 +01:00
Philipp
f0c29edcde
Adapt BaseURL calls to new UriInterface
2023-02-18 21:12:21 +01:00
Philipp
402d45d490
Move force_ssl behavior
2023-02-18 21:12:20 +01:00
Philipp
dbb7022ca5
Refactor Installer due new BaseURL logic
2023-02-18 21:12:20 +01:00
Philipp
45749c14be
Refactor BaseURL.php to UriInterface compatible class
...
- remove parts
- added tests
2023-02-18 21:12:20 +01:00
Hank Grabowski
34c4849341
Merge branch 'develop' into mastodon-status-post-with-title
2023-02-18 10:30:57 -05:00
Hank Grabowski
4b2ee284d8
Change check for friendica-title key to use isa and always set
2023-02-18 10:07:08 -05:00
Michael
608b5a37a4
Activities are now displayed as Emojis
2023-02-18 06:56:03 +00:00
Hypolite Petovan
960fdb9076
Merge pull request #12806 from annando/loglevels
...
Some loglevels are adjusted to more reasonable levels
2023-02-17 18:19:03 -05:00
Hypolite Petovan
6d38b44b97
Merge pull request #12799 from HankG/fix-mastodon-friend-requests-ids
...
Change FollowRequest to return the user ID so is compatible with POST endpoint
2023-02-17 18:09:26 -05:00
Hank Grabowski
f10821f915
Add friendica->title input to Mastodon Status POST API for explicitly setting title
...
- update logic so that if it is provided with a spoiler text then the spoiler text is always used as actual spoiler text and the title is the title.
2023-02-17 17:42:55 -05:00
Hank Grabowski
40ee96512a
Add extension to Mastodon Status object for Friendica-specific things
...
- first entry is the title
2023-02-17 17:42:00 -05:00
Hank Grabowski
9187723263
Add link headers to Mastodon trending endpoints
2023-02-17 13:24:11 -05:00
Hank Grabowski
2754cdc5d6
Add Link headers by offset/limit capability to BaseApi
2023-02-17 13:24:00 -05:00
Hank Grabowski
df4af8da9b
Fix offset is absolute in set not a page to be consistent with SQL
2023-02-17 13:23:34 -05:00
Hank Grabowski
e6c93d31c1
Add offset parameter to Mastodon trending Links and Statuses endpoints
2023-02-17 11:59:30 -05:00
Hank Grabowski
6a94632131
Add documentation to new trending tags endpoint QPs
2023-02-17 11:25:25 -05:00
Hank Grabowski
f40cd60e39
Remove FollowRequest type and use mstdnAccount->createFromContactId instead
2023-02-17 11:09:16 -05:00
Hank Grabowski
67b8ad242b
Allow @-symbols in Mastodon status searches under all conditions
2023-02-17 10:49:32 -05:00
Hank Grabowski
c5effdadec
Add support to Mastodon Tag Trends for paging, local tags, and faster refresh
...
= with phpcbf format auto-correction
2023-02-16 22:55:23 -05:00
Hank Grabowski
e3bfb39e91
Remove explicit block filtering for results that go through selectViewForUser
2023-02-16 16:06:56 -05:00
Michael
baf75adfca
Some loglevels are adjusted to more reasonablöe levels
2023-02-16 20:47:37 +00:00
Hank Grabowski
a4515daca4
Add blocked/ignored filters to Mastodon Timeline API Direct and List endpoints
2023-02-16 08:08:58 -05:00
Hank Grabowski
d6c1e85b5f
Add blocked/ignored filters to Mastodon Timeline API Home and Tags endpoints
2023-02-16 08:05:32 -05:00
Hank Grabowski
18bb181a78
Cleanup unused imports, excessive line length in Mastodon FollowRequest factory
2023-02-15 15:43:57 -05:00
Hank Grabowski
4964e947c9
Delete unused Mastodon FollowRequest object (can just use Account now)
2023-02-15 15:43:17 -05:00
Hank Grabowski
31b746cb16
Change FollowRequest return type to be Account
2023-02-15 15:40:10 -05:00
Hank Grabowski
cb1adf983b
Fix style error
2023-02-15 15:13:30 -05:00
Hank Grabowski
c084e6a427
Allows @ in query on statuses when resolving since Mastodon links have it
2023-02-15 15:12:58 -05:00
Hank Grabowski
637b6f5a17
Change FollowRequest to return the user ID so is compatible with POST endpoint
2023-02-15 12:30:49 -05:00
Michael
9f7747a360
We can now store emoji reactions from Misskey
2023-02-15 05:13:40 +00:00
Philipp
40e0ea239a
Merge pull request #12796 from annando/fatal
...
Fix fatal error because of an invalid url
2023-02-14 22:28:01 +01:00
Michael
a3cb43805c
Fix fatal error because of an invalid url
2023-02-14 21:19:47 +00:00
Michael
9a93c8f1c5
Fix caps
2023-02-14 20:52:33 +00:00
Hypolite Petovan
f9b3340599
Merge pull request #12786 from annando/c2s-post
...
C2S: Posting is now possible
2023-02-14 15:49:25 -05:00
Michael
64a8ad6601
Fix variable name
2023-02-14 20:43:54 +00:00
Michael
41f6e72aa0
Some more standards
2023-02-13 23:57:39 +00:00
Michael
c643eb8cb2
Fix more standards
2023-02-13 23:53:43 +00:00
Michael
2367f54d41
Soem more C2S stuff moved
2023-02-13 23:49:08 +00:00
Michael Vogel
5e84fc849b
Apply suggestions from code review
...
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2023-02-14 00:34:47 +01:00
Hank Grabowski
e384a9d6ca
Automatic PHPCBF style fix
2023-02-13 17:27:06 -05:00
Hank Grabowski
7e91a88d9b
Add unsupported Friendica notification types to built query
2023-02-13 17:26:24 -05:00
Michael
8fe6419d39
New class for c2s activities
2023-02-13 21:27:11 +00:00
Hank Grabowski
8bfca6373a
Remove extraneous, unused, non-standard 'count' parameter from request list
...
- artifact of when I was playing around with the endpoint that somehow
didn't get deleted when I did the ultimate commit.
2023-02-13 15:13:17 -05:00
Michael
7b871f3ecd
Merge remote-tracking branch 'upstream/develop' into c2s-post
2023-02-13 19:20:18 +00:00
Michael
b02e48e9c3
Split C2S activity
2023-02-13 15:32:14 +00:00
Hypolite Petovan
b168ff3e17
Merge pull request #12772 from nupplaphil/feat/config_hybrid
...
Revert node.config.php into Config table
2023-02-13 08:16:29 -05:00
Michael
a7b3949ca0
Added documentation
2023-02-13 11:57:02 +00:00
Philipp
3894b6fa41
Fix logic
2023-02-13 11:34:32 +01:00
Michael
2c41ebbfaa
passing the return value
2023-02-13 06:27:45 +00:00
Philipp
2bc9f085df
Add docs
2023-02-12 23:54:11 +01:00
Philipp
4dc164a5a1
manually check and create the Config table before running the update
2023-02-12 16:44:56 +01:00
Philipp
aeb3c7e96c
don't try to use the Config table if it doesn't exist
2023-02-12 16:23:51 +01:00
Philipp
a9c0636573
remove maybeSerialize (always serialize)
2023-02-12 15:48:41 +01:00
Philipp
8881882bce
another phpunit optimiziation ..
2023-02-12 15:41:25 +01:00
Michael
edb1ce0417
C2S: Posting is now possible
2023-02-12 14:18:03 +00:00
Philipp
2d090f0d80
adhere php-cs
2023-02-12 13:17:55 +01:00
Philipp
a153c3f594
Fix and adapt tests
2023-02-12 13:09:14 +01:00
Philipp
23742c22c3
suppress E_WARNING at tests with vfs://
2023-02-12 11:41:20 +01:00
Philipp
7895024e75
add license
2023-02-10 14:54:17 +01:00
Philipp
513ef03421
Revert node.config.php into Config table
2023-02-10 14:06:22 +01:00
Philipp
6db89adc04
Re-Add Config table
2023-02-10 14:06:22 +01:00
Philipp
98857f8d7a
Add exception if lock wasn't successful
2023-02-10 14:06:21 +01:00
Michael
6eadbb35dc
Redirect AP requests to the root to the system actor
2023-02-10 10:29:35 +00:00
Michael
5fdeed8ed8
C2S: Improve C2S-API, fix inbox endpoint
2023-02-08 20:16:19 +00:00
Hypolite Petovan
7621c8aac5
Merge pull request #12778 from annando/issue-12764
...
Issue 12764: Fix photo permissions when posting via web
2023-02-07 10:15:00 -05:00
Michael
4d4e34dc64
Issue 12764: Fix photo permissions when posting via web
2023-02-07 14:18:01 +00:00
Hypolite Petovan
447709377c
Ensure arbitrary HTTPException messages are HTML escaped
...
- These messages can include user-supplied strings
2023-02-04 20:36:33 -05:00
Hypolite Petovan
4e355c0f5e
Create specific module to display HTML message when a conversation isn't found in Module\Item\Display
2023-02-04 20:28:04 -05:00
Michael
f455f7e7d1
Fixes "Invalid URL for photo" for photos without host
2023-02-04 12:14:40 +00:00
Michael Vogel
ac469742b1
Merge pull request #12762 from MrPetovan/bug/warnings
...
Ward against potentially missing "platform" array key in Model\GServer::fetchSiteinfo
2023-02-02 11:54:50 +01:00
Hypolite Petovan
a836c5c3f1
Merge pull request #12752 from annando/c2s
...
First implementation of ActivityPub C2S
2023-02-01 11:48:24 -05:00
Michael
18dcf77a6d
Desciption added
2023-02-01 16:33:07 +00:00
Hypolite Petovan
301fa681c5
Ward against potentially missing "platform" array key in Model\GServer::fetchSiteinfo
...
- Address https://github.com/friendica/friendica/issues/12488#issuecomment-1411635902
2023-02-01 08:35:33 -05:00
Michael
a3d645645a
Fix #12757
2023-01-31 05:45:24 +00:00
Michael
f078b6bc18
Issue 12753: For remote-self feed items the plink mustn't point to the original feed link
2023-01-30 06:58:36 +00:00
Michael
b90d6a5638
Updated class description
2023-01-29 17:51:04 +00:00
Michael
101b3c9703
First implementation of ActivityPub C2S
2023-01-29 14:41:14 +00:00
Philipp
df021b07e3
Merge pull request #12747 from MrPetovan/bug/warnings
...
Address a couple of warnings
2023-01-29 08:21:46 +01:00
Philipp
450c753004
Merge pull request #12746 from MrPetovan/bug/fatal-errors
...
Remove Feed contacts from profile contact list
2023-01-29 08:21:26 +01:00
Hypolite Petovan
48a7958ef9
Check $url variable for value before using it in Module\Photo::getPhotoById
...
- Address https://github.com/friendica/friendica/issues/12488#issuecomment-1407342540
2023-01-29 00:12:59 -05:00
Hypolite Petovan
9a270de9c2
Prevent the use of $shared_item if it's falsy in Mastodon\Status::createQuote
...
- Address https://github.com/friendica/friendica/issues/12488#issuecomment-1407342324
2023-01-29 00:11:13 -05:00
Hypolite Petovan
b1eae0c9aa
Remove Feed contacts from profile contact list
...
- These contact don't have a public pendant and therefore shouldn't be shown to visitors
- Address https://github.com/friendica/friendica/issues/12486#issuecomment-1406191980
2023-01-29 00:07:20 -05:00
Hypolite Petovan
b66787f0de
Improve return value consistency in Util\BasePath::getPath
2023-01-28 22:19:47 -05:00
Hypolite Petovan
1dc97e30e0
Read local files instead of performing self HTTP requests in JsonLD::documentLoader
2023-01-28 22:17:05 -05:00
Michael
3f618218c7
Old stuff removed
2023-01-28 18:50:45 +00:00
Michael
999cdc7db9
Avoid more local links and bad http requests
2023-01-28 14:57:04 +00:00
Michael Vogel
fc46778a00
Merge pull request #12735 from MrPetovan/bug/fatal-errors
...
Address a couple of Fatal errors
2023-01-27 08:55:27 +01:00
Michael Vogel
1d7d6fe35c
Merge pull request #12736 from MrPetovan/bug/12733-webfinger-apcontact
...
Replace custom WebFinger implementation by Probe::getWebfingerArray in APContact::fetchWebfingerData
2023-01-27 08:27:20 +01:00
Hypolite Petovan
79dc5c177e
Replace custom WebFinger implementation by Probe::getWebfingerArray in APContact::fetchWebfingerData
...
- This implementation didn't support separate domains for the address and the final account
2023-01-27 01:24:28 -05:00
Hypolite Petovan
91d8cd2c87
Prevent fatal error when probing WebFinger address in Network\Probe::feed
2023-01-27 01:24:22 -05:00
Michael Vogel
94b63e6a00
Apply suggestions from code review
...
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2023-01-27 07:21:08 +01:00
Michael
ba4860b787
Avoid local network communication / invalid url requests
2023-01-27 05:55:45 +00:00
Hypolite Petovan
be105db759
Check the image URL has a host before retrieving it in Photo::importProfilePhoto
...
- Address https://github.com/friendica/friendica/issues/12486#issuecomment-1404324012
2023-01-25 22:31:07 -05:00
Hypolite Petovan
0259af1118
Cast key values to int in Mastodon\Stats
...
- Address https://sekretaerbaer.de/display/61b27817-3763-cd4c-5fca-b4d397968464
2023-01-25 22:11:22 -05:00
Michael
3e8c38946d
Catch not fetchable posts
2023-01-25 23:03:51 +00:00
Michael
ae3afaad94
Restore default value
2023-01-25 22:38:11 +00:00
Michael
30093fd2ec
Quote for notifications
2023-01-25 20:35:10 +00:00
Michael
b6fcfebd56
Switch parameters
2023-01-25 20:14:33 +00:00
Michael
b46f18bdf9
Fix reply via API / fix missing variable
2023-01-25 10:16:24 +00:00
Michael
c27fdc7167
Unused "use" removed
2023-01-25 06:34:15 +00:00
Michael
49d513f8d2
API: added positiv list for quote support
2023-01-25 06:26:17 +00:00
Hypolite Petovan
b4cbe4250e
Remove Text\BBCode::scaleExternalImage
...
- Image size is a CSS concern, not a PHP one
2023-01-23 20:40:20 -05:00
Michael
b61923700e
Display, not diplay
2023-01-23 22:30:28 +00:00
Michael
c471a78b05
Issue 12358: Allow blocking of every contact
2023-01-23 21:44:30 +00:00
Michael
d0373ab414
Issue 12603: Support quote in the api / Issue 12654: prevent privacy leakage
2023-01-23 21:24:50 +00:00
Michael
ff28044cf6
Issue 12603: Support quotes in the API
2023-01-23 19:00:20 +00:00
Michael
5a01fb0521
Don't show reblogged on single post
2023-01-23 17:56:45 +00:00
Michael
0364972242
Merge remote-tracking branch 'upstream/develop' into api
2023-01-23 17:52:54 +00:00
Michael
87e9dafc56
Removed duplicated "be"
2023-01-23 06:48:42 +00:00
Michael
75cac38fe3
Updated messages.po
2023-01-23 06:43:13 +00:00
Michael Vogel
807c2dfe6a
Update src/Module/Settings/Connectors.php
...
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2023-01-23 04:52:41 +01:00
Michael
b2d7c4ec43
Merge remote-tracking branch 'upstream/develop' into api
2023-01-22 19:11:21 +00:00
Michael
8e4e2eecb7
Issue 12702: Let the user decide how to handle spoiler texts
2023-01-22 17:10:31 +00:00
Michael
edf3e9c4b6
Improved block check for redirects
2023-01-22 12:33:38 +00:00
Michael
2ecc797541
API: Show different ids on reshares / don't check for client secret
2023-01-22 11:25:31 +00:00
Philipp
ced77ccbce
Merge pull request #12697 from MrPetovan/bug/deprecated
...
Fix a few PHP8.2 deprecation messages
2023-01-21 23:00:32 +01:00
Philipp
98da37076d
Add more transparent errors and make it possible to see them in logs
2023-01-21 21:07:20 +01:00
Philipp
8082b68185
Remove another URL check at App
2023-01-21 21:07:20 +01:00
Philipp
3de78fc60b
Remove BaseURL Auto-Check
2023-01-21 21:07:20 +01:00
Hypolite Petovan
73c8720d41
Declare history property in Mastodon\Card
...
- Address part of https://github.com/friendica/friendica/issues/12011#issuecomment-1383173055
2023-01-21 14:25:21 -05:00
Hypolite Petovan
c79cec2652
Replace deprecated uses of ${var} in strings
...
- Address part of https://github.com/friendica/friendica/issues/12011#issuecomment-1383147421
2023-01-21 14:25:21 -05:00
Hypolite Petovan
7e618856ab
Replace deprecated use of "self" in callables
...
- Address part of https://github.com/friendica/friendica/issues/12011#issuecomment-1383147421
2023-01-21 14:25:21 -05:00
Hypolite Petovan
881cb456e2
Throw an exception when parse_url fails in HttpClient->request
...
- Address part of https://github.com/friendica/friendica/issues/12011#issuecomment-1383147421
2023-01-21 14:25:21 -05:00
Philipp
a7c4a3023a
Add "Database::INSERT_IGNORE" for the initial value check
2023-01-21 20:02:40 +01:00
Philipp
9627af924a
Add support for toString/Serializable
2023-01-21 19:42:48 +01:00
Hypolite Petovan
d3ef2b23cc
Don't select deleted contact when in Contact::createFromProbeForUser
2023-01-21 09:18:17 -05:00
Hypolite Petovan
6749ace4b7
Reset pending value when unfollowing a contact
2023-01-21 09:18:17 -05:00
Hypolite Petovan
5519b50900
Apply changes to user-contact table first in Contact::update
...
- The truncateFieldsForTable call in the same method was potentially restricting the fields that could be updated in the user-contact table
2023-01-21 09:18:17 -05:00
Hypolite Petovan
dcfb8bb73e
Fix connection acknowledgement not appearing on contact page
...
- Remove obsolete template variables
- Move contact_edit vier template to base template
2023-01-21 09:18:17 -05:00
Roland Häder
27969e8ca6
Continued:
...
- moved if() block to suggested position by MrPetovan, for me I want to have all
conditions checked at the start of the method, e.g. no unwanted null
references or (in this case) if the URL is blacklisted
- normalized URLs are without SSL, means http://host/path/file.ext so they exist
only once for contacts and servers (aka. instances)
- documented returned type `void`
2023-01-21 01:07:14 +01:00
Roland Häder
ba08692403
Continued:
...
- just for consistency ...
2023-01-20 02:43:59 +01:00
Roland Häder
a0704db43a
Continued:
...
- some trolls managed to flood gserver with useless URLs. They can be blocked
by domain blocking them, but still it floods gserver table with dead entries
- this hack tries to change that so they won't enter gserver at all. Let's hope
these trolls as `activitypub-trolls.cf` learn a lesson (and get adults soon)
Signed-off-by: Roland Häder <roland@mxchange.org>
2023-01-20 01:50:55 +01:00
Philipp
15938c5b87
Merge pull request #12695 from MrPetovan/bug/fatal-errors
...
Address a few fatal errors
2023-01-19 08:09:03 +01:00
Hypolite Petovan
c05956137a
Default maintenance reason to empty string in Module\Maintenance
...
- Address https://github.com/friendica/friendica/issues/12486#issuecomment-1383250546
2023-01-18 21:01:07 -05:00
Hypolite Petovan
3b99b98678
Truncate integer values before inserting them
...
- Address https://github.com/friendica/friendica/issues/12486#issuecomment-1383250353
2023-01-18 20:58:49 -05:00
Hypolite Petovan
d2033d4c92
Allow colon in password
...
- It was disallowed because of a too strict intepretation of RFC2617
2023-01-18 20:34:20 -05:00
Hypolite Petovan
81cd334664
Fix wrong logic in password allowed regular expression
2023-01-18 20:27:29 -05:00
Hypolite Petovan
16e1c8f893
Merge pull request #12690 from annando/statistics
...
Nodeinfo data has moved to key values
2023-01-18 08:37:20 -05:00
Michael
73e163100c
Nodeinfo data has moved to key values
2023-01-18 05:04:37 +00:00
Hypolite Petovan
c7e944e793
Merge pull request #12680 from nupplaphil/feat/addon_logger
...
Introduce new Hook logic
2023-01-17 16:37:03 -05:00
Michael
259fe7fcf2
Merge remote-tracking branch 'upstream/develop' into blocked-server
2023-01-17 19:25:09 +00:00
Philipp
5358e195d7
Fix Introspection
2023-01-17 20:11:48 +01:00
Philipp
8eed43a7dd
Add whitespace ..
2023-01-17 19:23:20 +01:00
Philipp
3b262f44a3
Adhere feedback
2023-01-17 19:15:37 +01:00
Philipp
eed6db2465
Apply suggestions from code review
...
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2023-01-17 19:12:33 +01:00
Michael
356a2a9a5a
News "blocked" field on the gserver table
2023-01-17 17:25:19 +00:00
Daniel Siepmann
da58b894a4
Properly handle feed item creation date with surrounding whitespace
...
Some feeds might have whitespace around the creation date.
This can't be parsed by DateTimeFormat methods.
Therefore the incoming creation date is trimmed to not contain any
surrounding whitespace for proper handling.
Relates: #12686
2023-01-17 07:18:47 +01:00
Philipp
293c121c48
Adhere PHP-CS..
2023-01-16 22:25:26 +01:00
Philipp
f609e38600
Introduce new Hook logic
...
- InstanceManager for computing strategies and to allow decorators
- Adapting Core\Logger to use it
2023-01-16 22:20:33 +01:00
Philipp
ab6efea9b2
Replace Config-Cache dependency with Config-Model (no more DB-waiting necessary)
2023-01-15 16:17:08 +01:00
Philipp
a6fb683bcd
Remove BasePath dependency from App\Mode
2023-01-15 16:17:07 +01:00
Philipp
dd6d96d048
Merge pull request #12678 from MrPetovan/bug/12677-addon_admin
...
Remove App dependency from addon admin form method
2023-01-15 15:55:08 +01:00
Hypolite Petovan
6e4663e747
Remove App dependency from addon admin form method
2023-01-15 09:42:18 -05:00
Hypolite Petovan
21f172c585
Merge pull request #12674 from nupplaphil/bug/config_typesafe
...
Config: Improve the node.config.php transformation
2023-01-15 09:38:29 -05:00
Philipp
bc60eb6cb7
Apply feedback and describe the encoding method
2023-01-15 11:57:43 +01:00
Tobias Diekershoff
9d7e172d2c
bump version to 2023.01
2023-01-15 11:50:23 +01:00
Philipp
d63aca97b8
Merge pull request #12673 from annando/andstatus-api
...
API: Accept "redirect_uris" as both array and string
2023-01-15 01:01:06 +01:00
Philipp
4c28f9cf9c
Config: Improve the node.config.php transformation
...
- Add more types
- Improvement for assoziative arrays and key-value arrays
- Add a lot more tests
2023-01-15 00:53:51 +01:00
Michael
e06f699dd9
Added Documentation, updated messages.po
2023-01-14 21:20:04 +00:00
Michael
af2a38c5b3
API: Accept "redirect_uris" as both array and string
2023-01-14 21:07:47 +00:00
Philipp
0c14e51112
Merge pull request #12666 from MrPetovan/bug/12661-public-calendar-export
...
Enable calendar export for public_calendar = true
2023-01-14 19:20:20 +01:00
Hypolite Petovan
323765110c
Enable calendar export for public_calendar = true
2023-01-14 10:39:18 -05:00
Hypolite Petovan
e73adde5fb
Remove App dependency from Hook::callSingle
...
- This was causing a circular dependency with the logger_instance hook
2023-01-14 10:38:37 -05:00
Hypolite Petovan
2d555b60dd
Merge pull request #12670 from annando/fix-avatar-cache
...
Ensure to reset the avatar paths when deleting avatar cache
2023-01-14 09:47:21 -05:00
Michael
3e3f2555dc
Ensure to reset the avatar paths when deleting avatar cache
2023-01-14 13:10:43 +00:00
Hypolite Petovan
91ff24b0e4
Merge pull request #12663 from nupplaphil/sec/xss_404
...
Security: Use htmlspecialchars() for user input in Arguments class
2023-01-13 13:57:41 -05:00
Philipp
a31d5ae7b1
Security: Use htmlspecialchars() for user input in Arguments class
2023-01-13 09:23:16 -05:00
Hypolite Petovan
0ad246f910
Drop UpdateContact worker task if contact is blocked
...
# Conflicts:
# src/Worker/UpdateContact.php
2023-01-13 09:23:01 -05:00
Hypolite Petovan
ee8e70e20e
Drop UpdateGServer worker task if domain is blocked
...
# Conflicts:
# src/Model/GServer.php
2023-01-13 09:21:43 -05:00
Hypolite Petovan
fab06c32e6
Add UriInterface-enabled isUriBlocked method in Util\Network
2023-01-13 09:20:14 -05:00
Hypolite Petovan
69f97649d2
Add UriInterface-enabled cleanUri method in Model\GServer
...
- Tests!
2023-01-13 09:20:09 -05:00
Michael
24208ef125
Fix: Forum posts from some contacts weren't distributed
2023-01-13 09:19:10 -05:00
Michael
0c8e0a033d
Improved handling of forum mentions
2023-01-13 09:18:47 -05:00
Michael
91aaf74402
Distribute forum comments only via the forum
2023-01-13 09:16:31 -05:00
Philipp
0530755332
Security: Use htmlspecialchars() for user input in Arguments class
2023-01-12 20:24:39 +01:00
Hypolite Petovan
a7d0355849
Merge pull request #12659 from DanielSiepmann/12658-fix-feed-urls-with-whitespace
...
Properly handle feed item urls with surrounding whitespace
2023-01-12 07:57:30 -05:00
Daniel Siepmann
6633b0af4b
Properly handle feed item urls with surrounding whitespace
...
Some feeds might have whitespace around the URLs of each item.
This can't be handled by parse_url.
Therefore the incoming url is trimmed to not contain any surrounding
whitespace for proper handling.
Relates: #12658
2023-01-12 13:47:57 +01:00
Michael
8a902afde5
Updated messages.po - again
2023-01-12 07:06:24 +00:00
Michael
6cdafb6b63
Fix "Undefined constant Friendica\Content\Conversation::PARCEL_DIASPORA"
2023-01-12 06:57:31 +00:00
Michael
f542211189
Mode depending control for the behaviour with blocked contacts
2023-01-12 06:25:55 +00:00
Hypolite Petovan
ec54b303c5
Merge pull request #12655 from annando/fix-communication
...
Fix: Forum posts from some contacts weren't distributed
2023-01-11 17:04:41 -05:00
Michael
53e8b21ca3
Fix: Forum posts from some contacts weren't distributed
2023-01-11 21:55:32 +00:00
Philipp
fef10e8a57
Improve encapsulation
2023-01-11 22:00:29 +01:00
Philipp
11a8bd17e3
Assure that deleted cat/keys are working as expected
...
- A deleted cache-key would delete a merged cache-key as well
- Deleting a key in the Model results in reloading the config to assure any value from underlying files
2023-01-11 21:53:34 +01:00
Philipp
fd882abd80
Revert Cache delete() behavior to stable version
2023-01-11 21:10:59 +01:00
Hypolite Petovan
5c8cd8fdd6
Replace remaining mentions of "Status" by "Conversations" or "Posts"
2023-01-11 09:01:29 -05:00
Hypolite Petovan
d0648b10ef
Convert Content\Nav to dynamic object
...
- Remove DI dependency in Module\Apps
2023-01-11 09:01:24 -05:00
Hypolite Petovan
3966b58965
Only show line number if it's provided in System::callstack
...
- Address https://github.com/friendica/friendica/issues/12488#issuecomment-1377373973
2023-01-10 10:41:20 -05:00
Hypolite Petovan
3fcafd1d50
Replace HTML regular expression by HTML::extractCharset in ParseUrl::getSiteInfo
...
- Address https://github.com/friendica/friendica/issues/12488#issuecomment-1374537440
2023-01-10 10:36:59 -05:00
Hypolite Petovan
5e2b655b43
Add implementation of HTTP Media Type
...
- Add charset extraction from DOMDocument
- TESTS!
2023-01-10 10:36:58 -05:00
Hypolite Petovan
f4b5d22396
Merge pull request #12644 from annando/improve-ignore
...
Improve the ignore behaviour
2023-01-10 09:05:48 -05:00
Michael
20a2cec0b0
Moved permission assigning / simplified block check
2023-01-10 05:59:25 +00:00
Hypolite Petovan
14e4c0db8e
Check image property is set in Object\Image
...
- Property was either an object or null, strict comparison with "false" was inaccurate
- Address https://github.com/friendica/friendica/issues/12486#issuecomment-1374888800
2023-01-09 16:06:22 -05:00
Hypolite Petovan
b77f3a7525
Check for URI ID existence in Post\Media::insert
...
- Address https://github.com/friendica/friendica/issues/12486#issuecomment-1374538325
2023-01-09 16:06:22 -05:00
Hypolite Petovan
4d5d8e5b64
Add line number to output in System::callstack
2023-01-09 16:06:22 -05:00
Hypolite Petovan
670b518875
Include other unique key column in condition in Model\Tag:store
...
- Address https://github.com/friendica/friendica/issues/12486#issuecomment-1372640002
2023-01-09 16:06:22 -05:00
Michael
4e0da578fa
Merge remote-tracking branch 'upstream/develop' into improve-ignore
2023-01-09 17:23:10 +00:00
Hypolite Petovan
6bee344681
Add yet another case to DateTimeFormat::fix
...
- Address https://github.com/friendica/friendica/issues/12488#issuecomment-1372637862
2023-01-09 11:38:25 -05:00
Michael
840f25cc5c
Improve ignoring of messages
2023-01-09 16:23:39 +00:00
Michael
cd3dbad2a8
Fix some warnings on item creation
2023-01-09 15:55:35 +00:00
Michael Vogel
c1f9c1aaa5
Apply suggestions from code review
...
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2023-01-08 23:13:31 +01:00
Michael
480d9f53c3
Added "collapsed" list
2023-01-08 18:28:19 +00:00
Michael
50746bad55
Merge remote-tracking branch 'upstream/develop' into collapse
2023-01-08 17:47:21 +00:00
Michael
50e43c530e
Posts from contacts can now be collapsed
2023-01-08 17:40:05 +00:00
Hypolite Petovan
0ae7a53daa
Merge pull request #12637 from annando/ostatus-subscription
...
OStatus: Fix PubSubHubBub subscription
2023-01-08 07:58:22 -05:00
Michael Vogel
1ef9768b98
Apply suggestions from code review
...
Co-authored-by: Philipp <admin+Github@philipp.info>
2023-01-08 13:00:58 +01:00
Michael
c3d836db63
OStatus: Fix PubSubHubBub subscription
2023-01-08 09:41:54 +00:00
Tobias Diekershoff
6bf670f64e
Merge pull request #12633 from MrPetovan/bug/12624-api-thumbnail
...
Change "thumbnail" for default Friendica banner image in Api\Mastodon\Instance
2023-01-08 08:28:24 +01:00
Hypolite Petovan
97642e770b
Treat unsupported API call as HTTP error
2023-01-07 22:47:52 -05:00
Hypolite Petovan
8ad94fef9b
Change "thumbnail" for default Friendica banner image in Api\Mastodon\Instance
2023-01-07 22:39:07 -05:00
Philipp
979672a3c1
Filter disabled addons with "null"
2023-01-08 02:49:56 +01:00
Philipp
5ea50a9e81
Fix "null" addon list
2023-01-08 02:49:56 +01:00
Philipp
2293ff6206
Add test for Addon failures
2023-01-08 02:49:56 +01:00
Philipp
0429a4e429
Fix loading empty node.config.php
2023-01-08 02:49:56 +01:00
Michael
aa3dc7c40c
Add configuration
2023-01-07 21:28:21 +00:00
Michael
49c1ad2cc0
Merge remote-tracking branch 'upstream/develop' into diaspora-item
2023-01-07 21:21:51 +00:00
Hypolite Petovan
5fd3d4bda3
Merge pull request #12628 from nupplaphil/bug/typeerror
...
Don't ksort() or loop without an addon array
2023-01-07 15:06:28 -05:00
Michael
24c32cff0d
Merge remote-tracking branch 'upstream/develop' into diaspora-item
2023-01-07 19:52:23 +00:00
Philipp
6aaf1ea5d4
Fix addons problem more elegant
2023-01-07 20:49:29 +01:00
Philipp
9fb5b95b5e
Fix other foreach() troubles at Addon.php
2023-01-07 19:54:59 +01:00
Michael Vogel
d5bc6d0006
Apply suggestions from code review
...
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2023-01-07 19:54:13 +01:00
Philipp
6454c1dee7
Don't ksort() on null
2023-01-07 19:52:43 +01:00
Michael
f5fd99f7ea
Unbneeded strlen removed
2023-01-07 18:51:28 +00:00
Michael
4e4eab7548
Merge remote-tracking branch 'upstream/develop' into mod-item
2023-01-07 17:14:40 +00:00
Michael
d86045058e
Diaspora: Photos are now transmitted separately
2023-01-07 15:11:34 +00:00
Philipp
6bd1740a94
omg .. wrong assertion ..
2023-01-07 15:49:55 +01:00
Philipp
6e4e2c4a82
Fix warning text
2023-01-07 15:30:45 +01:00
Philipp
b7a2b6b352
Update src/Module/Admin/Summary.php
...
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2023-01-07 15:28:49 +01:00
Philipp
6e0d16f22b
Add warning message in case node.config.php isn't writable
2023-01-07 15:16:55 +01:00
Hypolite Petovan
308618b559
Merge pull request #12622 from nupplaphil/bug/config
...
`node.config.php` bugfixings
2023-01-07 08:45:53 -05:00
Philipp
80e8f4aa34
Execute critical worker tasks, even if we're in daemon mode
2023-01-07 13:43:16 +01:00
Philipp
abd3b2180f
Merge pull request #12619 from MrPetovan/task/12617-remove-no_auto_update
...
Remove system.no_auto_update personal config key and assume default value of true
2023-01-06 17:54:36 +01:00
Philipp
5b2e02889e
Fix Update::run()
2023-01-06 17:50:56 +01:00
Philipp
baf3225916
Apply Update::check() suggestions
2023-01-06 12:50:14 +01:00
Philipp
c35fd68ec2
Adapt doc
2023-01-06 12:47:00 +01:00
Philipp
beb3d376b2
Apply suggestions from code review
...
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2023-01-06 12:46:06 +01:00
Philipp
05048d4abf
Update src/Core/Config/ValueObject/Cache.php
...
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2023-01-06 12:43:04 +01:00
Philipp
70704ccb19
Update src/Core/Update.php
...
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2023-01-06 12:42:56 +01:00
Philipp
9462bfa763
Update src/Core/Config/Util/ConfigFileManager.php
...
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2023-01-06 12:42:43 +01:00
Philipp
b3772163d8
Add doc
2023-01-06 03:06:11 +01:00
Philipp
ce8c820221
add description
2023-01-06 02:54:34 +01:00
Philipp
d53cb31869
Update src/Core/Config/Util/ConfigFileManager.php
...
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2023-01-06 02:16:35 +01:00
Philipp
e14050491a
Config fixing
...
- unlock/close the `node.config.php` in every circumstances
2023-01-06 01:10:57 +01:00
Philipp
5aa8e8adf1
Config fixings
...
- Delete now really overwrites static default/setting.config.php keys
- Delete now really overwrites static default/setting.config.php categories
- The Update::check() routine is added to different places
- Merge the given config file with the new config before writing
- Remove ConfigTransaction::get() because it's no more reliable
2023-01-06 01:03:00 +01:00
Philipp
cdd57275eb
Some improvements
...
- Move $_SERVER into ConfigFileManager constructor
- Rename "creatConfigFileLoader" to "createConfigFileManager"
- Rename variable "loader" to "manager" in all tests
2023-01-06 01:03:00 +01:00
Philipp
b4096251ba
Check 'config' table as fallback for migrations
2023-01-06 01:03:00 +01:00
Hypolite Petovan
6685157f8a
Cast alert types to boolean in Api\Mastodon\Subscription
2023-01-05 11:54:01 -05:00
Hypolite Petovan
3b9bf4d70d
Remove system.no_auto_update personal config key and assume default value of true
...
- By popular request, the behavior with false was too perturbating
2023-01-05 10:27:03 -05:00
Hypolite Petovan
dfcfae6bcc
Replace $_GET references with $request in Update classes
2023-01-05 10:23:25 -05:00
Michael Vogel
2f28ec7af0
Merge pull request #12615 from MrPetovan/task/12601-update-gserver-block
...
Drop UpdateGServer worker task if domain is blocked
2023-01-05 12:37:00 +01:00
Philipp
4b17d6f3bf
Update src/Core/Addon.php
...
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2023-01-04 23:12:41 +01:00
Michael
9a1a406c03
Preview of attached links work again
2023-01-04 21:52:02 +00:00
Philipp
01403d15c4
sort addon array
2023-01-04 21:55:51 +01:00
Philipp
13b234d279
Use addons config entries instead of the addon table
2023-01-04 21:55:51 +01:00
Philipp
cd11088cc4
Move 'addon' table into config
2023-01-04 21:55:51 +01:00
Hypolite Petovan
647ab1d04a
Drop UpdateContact worker task if contact is blocked
2023-01-04 14:41:09 -05:00
Hypolite Petovan
1f3c07c06f
Drop UpdateGServer worker task if domain is blocked
2023-01-04 14:41:09 -05:00
Hypolite Petovan
a907d6c87b
Add UriInterface-enabled isUriBlocked method in Util\Network
2023-01-04 14:41:08 -05:00
Hypolite Petovan
a574146f04
Add UriInterface-enabled cleanUri method in Model\GServer
...
- Tests!
2023-01-04 14:41:08 -05:00
Philipp
dce86be58e
Just commit config transactions if something changed
2023-01-04 19:55:22 +01:00
Philipp
aabe39220d
Make flock writing easier
2023-01-04 08:16:40 +01:00
Philipp
c057954896
Make BaseURL check/save transactional and make the whole process easier
2023-01-04 08:14:00 +01:00
Michael
d1a951f0ac
Post processing centralized
2023-01-04 06:52:40 +00:00
Michael
0d56f156f7
Code cleanup for mod/item.php
2023-01-04 05:44:52 +00:00
Philipp
17105cf7d1
Fix config read/write locking
2023-01-04 00:25:18 +01:00
Philipp
4c2fc3ea38
Reduce config->set() load for worker executions
2023-01-04 00:25:15 +01:00
Philipp
176af67e88
Fix empty fetchResult curResult at Link::fetchMimeType (thx to Marco R.)
2023-01-03 21:06:16 +01:00
Philipp
3110831131
Fix empty fetchResult at ExternalStorage (thx to Marco R.)
2023-01-03 21:05:58 +01:00
Philipp
beff759c82
Update src/Core/Config/Model/ConfigTransaction.php
...
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2023-01-03 17:39:32 +01:00
Philipp
a46cd2fb36
Remove get() from config transaction interface
2023-01-03 17:26:48 +01:00
Philipp
b439df892a
Apply suggestions
2023-01-03 17:24:05 +01:00
Philipp
dd88d193b9
Escape single quotes and backslashes
2023-01-03 15:36:36 +01:00
Philipp
65d79d4c93
Introduce ISetConfigValuesTransactional for transactional config behaviour
2023-01-03 14:22:07 +01:00
Philipp
4d4b4a8858
Revert BaseURL
2023-01-03 14:22:07 +01:00
Philipp
376e0a9397
Fix Admin\Site
2023-01-03 14:22:07 +01:00
Philipp
ae1533e312
Apply suggestions from code review
...
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2023-01-03 14:22:06 +01:00
Philipp
88b3effc18
Use toConfigValue in case of serialized, legacy data
2023-01-03 14:22:05 +01:00
Philipp
10f3de0aa2
Remove deprecated Mode::DBCONFIGAVAILABLE
2023-01-03 14:22:04 +01:00
Philipp
1e574d5383
Refactor IManageConfigValues interface
2023-01-03 14:22:04 +01:00
Philipp
d272e8c3c7
Remove unnecessary classes
2023-01-03 14:22:03 +01:00
Philipp
b871e1d264
Introduce lightweight Config model
2023-01-03 14:22:02 +01:00
Philipp
0f91d1cbde
Introduce ConfigFileManager for config files
2023-01-03 14:22:02 +01:00
Philipp
fea4b202c1
Introduce ConfigFileTransformer for Config files
2023-01-03 14:22:02 +01:00
Hypolite Petovan
9c256ad76f
Remove obsolete OExchange module and reference
...
- Protocol looks unsupported for a decade now
2023-01-01 19:20:42 -05:00
Hypolite Petovan
8bbf9e93c6
Remove dependency to the second parameter of XML::fromArray
2023-01-01 19:20:42 -05:00
Hypolite Petovan
931ccde90d
Merge pull request #12597 from annando/activity-distribution
...
Don't distribute unsigned remote activities
2023-01-01 19:19:25 -05:00
Michael Vogel
6b914ccc0f
Merge pull request #12586 from MrPetovan/task/entitize-delivery-queue
...
Add Entity-Factory-Repository for deliver-queue
2023-01-02 00:56:13 +01:00
Hypolite Petovan
a786bd3777
Remove unused static methods related to delivery-queue
2023-01-01 18:50:21 -05:00
Hypolite Petovan
a744b8b56f
Replace direct database calls and anonymous arrays by repository calls and entity objects
2023-01-01 18:50:21 -05:00
Hypolite Petovan
49654c0d99
Create entity-related classes for delivery-queue table
2023-01-01 18:50:19 -05:00
Hypolite Petovan
f9676c9ed2
Convert Directory Search results into contact-looking records
...
- Address https://github.com/friendica/friendica/issues/12488#issuecomment-1368216631
2023-01-01 18:47:45 -05:00
Hypolite Petovan
6e06a7f14c
Remove dependency to DI in Search\Acl module
2023-01-01 18:47:44 -05:00
Michael
78c3c56ca5
Don't distribute unsigned remote activities
2023-01-01 23:37:17 +00:00
Philipp
4faf08c064
Merge pull request #12562 from MrPetovan/bug/notices
...
Ward againt contact_id = 0 in UpdateContact worker
2023-01-02 00:34:21 +01:00
Michael
24065d307b
Fix communication to Diaspora when not in bulk mode
2023-01-01 19:52:08 +00:00
Michael
f1bcf1ef66
Set the server status directly after transmission
2023-01-01 17:34:05 +00:00
Michael
12fac6e089
Close the database
2023-01-01 15:37:47 +00:00
Michael
360614d2cf
Merge remote-tracking branch 'upstream/develop' into inbox-gsid
2023-01-01 15:25:28 +00:00
Michael
df5305f384
Increase another forgotten year
2023-01-01 15:15:16 +00:00
Michael
fe897c7ef4
Increase the year
2023-01-01 15:14:45 +00:00
Michael
7307646cf8
Use server id on direct delivery
2023-01-01 15:13:44 +00:00
Hypolite Petovan
1874a32728
Happy New Year 2023!
2023-01-01 09:36:24 -05:00
Michael
6bc9754b24
Add the server id for all Diaspora contacts
2023-01-01 10:52:22 +00:00
Michael
06403f1546
License updated
2023-01-01 07:52:28 +00:00
Michael
12d37835b4
Set "archive" status
2023-01-01 00:18:01 +00:00
Michael
e21db0fe6d
The inbox-status can now be archived for a whole server
2022-12-31 23:42:00 +00:00
Michael
e0a5e32f8e
Avoid undefined variable "$rendered"
2022-12-31 16:47:33 +00:00
Hypolite Petovan
319857edaa
Merge pull request #12583 from annando/delivery-queue
...
Bulk delivery added for all protocols
2022-12-31 11:36:54 -05:00
Michael
8e397b5849
Changes after review
2022-12-31 16:20:18 +00:00
Michael
f022a49f9e
New "Defunct" check
2022-12-31 16:01:40 +00:00
Michael
dc528a020b
Remove blank
2022-12-31 12:47:48 +00:00
Michael
259b99e6e9
Bulk delivery added for all protocols
2022-12-31 12:19:34 +00:00
Philipp
2844ea779d
Merge pull request #12579 from MrPetovan/bug/fatal-errors
...
Add previous exception to unexpected worker exception logging
2022-12-31 10:08:30 +01:00
Hypolite Petovan
b0898ada29
Add previous exception to unexpected worker exception logging
2022-12-30 22:25:19 -05:00
Hypolite Petovan
b6f3f298fe
Add new case to DateTimeFormat::fix
...
- Address https://github.com/friendica/friendica/issues/12488#issuecomment-1368011436
2022-12-30 21:40:37 -05:00
Hypolite Petovan
19b5362f93
Return early when inbox-status row couldn't be inserted in HTTPSignature->setInboxStatus
...
- Address https://github.com/friendica/friendica/issues/12488?notification_referrer_id=NT_kwDOAA4e57E1MTM1MzE3MjU2OjkyNTQxNQ#issuecomment-1366991471
2022-12-30 17:23:23 -05:00
Hypolite Petovan
6e31b8d6a5
Avoid return type exeption in HTTPSignature->post
...
- Prefer passing the owner record array instead of just the uid
- +4/-7 calls to User::getOwnerDataById
2022-12-30 17:23:22 -05:00
Michael
ce6845f44f
Code standards
2022-12-30 21:44:12 +00:00
Michael
4eceb2d26f
Merge remote-tracking branch 'upstream/develop' into move-delivery
2022-12-30 21:40:09 +00:00
Michael
e4c5d9f62d
Fix code standards
2022-12-30 21:37:09 +00:00
Hypolite Petovan
bacf901d0e
Merge pull request #12574 from nupplaphil/feat/keyvalue_storage
...
Introduce key-value storage
2022-12-30 16:36:03 -05:00
Michael
9115ec5f0d
Adjust class references to the new location
2022-12-30 21:20:28 +00:00
Michael
6d087ee455
Move delivery functionality to a new class
2022-12-30 21:19:55 +00:00
Hypolite Petovan
e563de4de7
Ward againt contact_id = 0 in UpdateContact worker
...
- Add parameter validation in Worker\UpdateContact::add
- Address https://github.com/friendica/friendica/issues/12487#issuecomment-1366833644
2022-12-30 02:10:29 -05:00
Hypolite Petovan
12df6297d7
Remove attachment tags before checking for end of body images
2022-12-30 02:10:11 -05:00
Philipp
f96aec18cc
Fixup maintenance mode
2022-12-29 23:38:14 +01:00
Philipp
a330a3c22d
Make PHP-CS happy again
2022-12-29 22:38:01 +01:00
Philipp
86f80af432
Rename Interface
2022-12-29 22:37:12 +01:00
Philipp
8894b482dc
Find last "update_" config entry occurrence
2022-12-29 22:36:45 +01:00
Philipp
7c4c409060
Change key-value table
...
- Make "k" as primary key
- Added "updated_at"
2022-12-29 22:36:08 +01:00
Philipp
f944a2a620
rollback unwanted change
2022-12-29 22:13:39 +01:00
Philipp
925c30280c
Apply suggestions from code review
...
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2022-12-29 22:12:02 +01:00
Philipp
965caf98a5
Replace database "update_" config entries with key-value entries
2022-12-29 21:53:58 +01:00
Philipp
1ed67fba3d
Replace addon "last" config entries with key-value entries
2022-12-29 21:53:57 +01:00
Philipp
b227d65dfc
Replace worker_daemon_mode config entry with key-value entry
2022-12-29 21:53:57 +01:00
Philipp
6b3265742a
Replace cron/worker "last" config entries with key-value entries
2022-12-29 21:53:57 +01:00
Philipp
10f8631cd9
Replace PostUpdate key-value config entries with key-value pair entries
2022-12-29 21:53:56 +01:00
Philipp
47764387b3
Introduce Key-Value Pair storage provider
2022-12-29 21:53:56 +01:00
Hypolite Petovan
44818ba556
Merge pull request #12572 from mexon/mat/network-failure-error
...
Return network match failure in error message instead of logging
2022-12-29 15:11:36 -05:00
Hypolite Petovan
03e03c126d
Merge pull request #12573 from mexon/mat/local-host
...
Allow HTTP requests to hosts in local hosts file
2022-12-29 14:40:10 -05:00
Matthew Exon
9c33074bdc
Allow HTTP requests to hosts in local hosts file
2022-12-29 19:44:49 +01:00
Matthew Exon
119be35a79
Return network match failure in error message instead of logging
2022-12-29 19:42:22 +01:00
Matthew Exon
1dbbafa1af
Allow adding local contacts via console
2022-12-29 19:39:27 +01:00
Hypolite Petovan
8b1947bd78
Add Core\Logger to the introspection skip class list
...
- Make class list explicit to avoid confusion between similar class names
- Update skipped class string match to a safer "starts with" condition
2022-12-28 17:54:37 -05:00
Hypolite Petovan
9dbcbe0482
Remove extraneous Introspection->isTraceClassOrSkippedFunction second parameter
2022-12-28 17:51:07 -05:00
Hypolite Petovan
59b5d080d5
Merge pull request #12558 from MarekBenjamin/fix-disorted-portraits
...
Fixed width and height not updated when image rotation is done by EXIF based orient method
2022-12-28 17:30:47 -05:00
MarekBenjamin
2d1d06c6d2
Update src/Object/Image.php
...
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2022-12-28 23:19:53 +01:00
MarekBenjamin
ed05d6376d
Update src/Object/Image.php
...
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2022-12-28 23:19:48 +01:00
Hank Grabowski
4f0968a93c
Make tag 'Names' Field have case-sensitive version
2022-12-28 17:01:06 -05:00
Marek Bachmann
19b8b389fd
Fixed width and height not updated when image rotation is done by EXIF based orient method
2022-12-28 21:43:34 +01:00
Hypolite Petovan
689b6b015b
Merge pull request #12557 from annando/reduce-update-contacts
...
Reduce the amount of "UpdateContact" worker calls
2022-12-28 13:12:30 -05:00
Hypolite Petovan
21056ae587
Merge pull request #12548 from MarekBenjamin/doubled_code_for_scaling-dimensions
...
Replace duplicated code by Images::getScalingDimensions call in Object\Image->scaleDown
2022-12-28 11:48:21 -05:00
Michael
088a3b6bc4
Merge remote-tracking branch 'upstream/develop' into reduce-update-contacts
2022-12-28 16:06:08 +00:00
Michael
954b95b039
Updated logging
2022-12-28 16:04:31 +00:00
Marek Bachmann
eb87a2afbe
Merge remote-tracking branch 'origin/doubled_code_for_scaling-dimensions' into doubled_code_for_scaling-dimensions
...
# Conflicts:
# src/Object/Image.php
2022-12-28 16:43:47 +01:00
Marek Bachmann
7b34fdc715
removed one redundant check for height and width beeing set
2022-12-28 16:42:38 +01:00
MarekBenjamin
2c509ac2b2
Update src/Object/Image.php
...
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2022-12-28 16:32:33 +01:00
Michael
54d308fb8a
Fix indention
2022-12-28 15:16:07 +00:00
Michael
e0e2e45b91
Reduce the amount of "UpdateContact" worker calls
2022-12-28 14:56:12 +00:00
Tobias Diekershoff
5c3cb63952
Merge pull request #12549 from MrPetovan/task/12490-fakelink-button
...
Turn fake link spans into full-fledged buttons
2022-12-28 07:39:56 +01:00
Hypolite Petovan
a1dc6e2417
Switch rounding to flooring in Temporal::getRelativeDate
...
- Add tests for regression
2022-12-28 00:32:26 -05:00
Hypolite Petovan
53c0fffbec
Add ClockInterface dependency to Temporal::getRelativeDate
...
- Remove unused $format parameter
2022-12-28 00:31:20 -05:00
Hypolite Petovan
a1070f4818
Turn fake link spans into full-fledged buttons
2022-12-27 21:47:35 -05:00
Marek Bachmann
88a7dd1afb
Replaced the doubled code in for getScalingDimension with Images::getScalingDimensions($width, $height,$max)
2022-12-28 03:30:56 +01:00
Philipp
7b42657d1e
Fix redirects
2022-12-27 20:08:33 +01:00
Hypolite Petovan
89705afa9d
Merge pull request #12540 from annando/forum-thread
...
Improved handling of forum mentions
2022-12-27 12:13:36 -05:00
Michael
b7e461d2f3
Improved handling of forum mentions
2022-12-27 17:01:40 +00:00
Philipp
e0fa557f18
Merge pull request #12539 from annando/forum-thread
...
Distribute forum comments only via the forum
2022-12-27 17:51:22 +01:00
Michael
ca0e3e3db7
Distribute forum comments only via the forum
2022-12-27 16:14:04 +00:00
Hypolite Petovan
5c332af844
Merge pull request #12527 from nupplaphil/feat/request_id
...
Introduce Request::getRequestId()
2022-12-26 16:07:35 -05:00
Philipp
4f1bb0d274
Use X-REQUEST-ID for Error pages
2022-12-26 21:18:05 +01:00
Philipp
5584e7a4e5
Use X-REQUEST-ID for Logging
2022-12-26 21:18:04 +01:00
Philipp
10864e50c7
Adapt Logger\Introspection
...
- Create an interface
- Add it as constructor parameter
2022-12-26 21:18:04 +01:00
Philipp
bfc1c157f1
Adapt UserSession
...
- Move from App methods to UserSession methods
- Deprecate corresponding App methods
2022-12-26 21:18:04 +01:00
Michael
7c4b320f30
Cleanup work with the activity types
2022-12-26 15:08:46 +00:00
Hypolite Petovan
74229fe230
Ward against empty $target_item array (relocation) in Worker\Delivery->deliverDFRN
...
- Address third part of https://github.com/friendica/friendica/issues/12488#issuecomment-1364487793
2022-12-26 09:22:44 -05:00
Hypolite Petovan
482eeb7109
Fix wrong square bracket position in Worker\Delivery->deliverDFRN
...
- Address second part of https://github.com/friendica/friendica/issues/12488#issuecomment-1364487793
2022-12-26 09:11:37 -05:00
Hypolite Petovan
e8420dcb71
Query expected photo.type field in Protocol\DFRN::relocate
...
- Address first part of https://github.com/friendica/friendica/issues/12488#issuecomment-1364487793
2022-12-26 09:10:55 -05:00
Michael
e718d39ef0
Fixes "E_WARNING: Undefined variable $subject"
2022-12-26 12:14:45 +00:00
Michael
e05cbf46e1
Activity "Read" is now stored
2022-12-26 08:41:40 +00:00
Michael
46fdf696ee
Issue 12524: Fix first day of week
2022-12-25 22:45:34 +00:00
Michael
5298cd73b3
We now store the violation as well
2022-12-25 10:44:06 +00:00
Michael
cef4349421
Changed parameter order
2022-12-25 07:30:39 +00:00
Michael
dc73cbe30c
Simplified code
2022-12-24 23:33:21 +00:00
Michael
8a7d08ae28
Category added
2022-12-24 13:57:43 +00:00
Michael
bf4d321aa3
Wrong variable
2022-12-24 08:09:23 +00:00
Michael
4c945850f4
Reports: The reporting contact id is added
2022-12-24 08:03:37 +00:00
Michael
8cb85368ff
Added comment
2022-12-23 22:48:57 +00:00
Michael
72e1d5d417
Fix storing reports
2022-12-23 22:43:32 +00:00
Michael
ca12d1549b
AP: We can now store received reports
2022-12-23 22:11:50 +00:00
Philipp
8fd0d4cdc0
Merge pull request #12513 from MrPetovan/bug/12507-rel-meeee
...
Add call to HTML::checkRelMeLink in Worker\CheckRelMeProfileLink
2022-12-23 21:12:06 +01:00
Hypolite Petovan
e4ac3c7922
Merge pull request #12510 from MarekBenjamin/email-notification_like-in-subject
...
Change email subject to "(...)like in conversation(...)" for likes in…
2022-12-23 07:57:28 -05:00
MarekBenjamin
3061cee083
Update src/Navigation/Notifications/Repository/Notify.php
...
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2022-12-23 11:14:38 +01:00
Hypolite Petovan
b2f2fbc4d4
Flatten conditions and add call to HTML::checkRelMeLink in Worker\CheckRelMeProfileLink
2022-12-23 02:44:49 -05:00
Hypolite Petovan
91c4ab2359
Add new xpathQuote and checkRelMeLink methods to Content\Text\HTML class
...
- Add tests for both methods
2022-12-23 02:41:22 -05:00
Michael
998b05095b
A server is only reachable when the network can be detected
2022-12-23 06:48:53 +00:00
Michael
1e888ad6a4
Always check whe verified
2022-12-23 06:26:58 +00:00
Michael
179d776d0a
Only check the homepage for active users with a homepage
2022-12-23 06:22:12 +00:00
Marek Bachmann
8393975cbc
Merge remote-tracking branch 'origin/email-notification_like-in-subject' into email-notification_like-in-subject
2022-12-23 02:38:15 +01:00
Marek Bachmann
b876a9efcd
Distinguish between comment likes and post likes.
2022-12-23 02:38:00 +01:00
MarekBenjamin
d52c988ebc
Update src/Navigation/Notifications/Repository/Notify.php
...
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2022-12-23 01:22:21 +01:00
Marek Bachmann
ef4f508f9b
messages.po and and corrected typo in comment
2022-12-23 01:06:21 +01:00
Marek Bachmann
82eec270fa
Change email subject to "(...)like in conversation(...)" for likes instead of "(...)new comment(...)"
2022-12-23 00:56:26 +01:00
Michael
99284222c1
Remove the activity
2022-12-22 22:08:42 +00:00
Michael
9fe70af85a
AP: Support for "move" and "accept" from gup.pe
2022-12-22 21:58:51 +00:00
Michael
d75cd8a00a
The GNU-Social import is removed
2022-12-21 22:21:22 +00:00
Hypolite Petovan
31e8574006
Merge pull request #12494 from annando/blurhash-fix
...
Don't calculate the blurhash on images without a size
2022-12-20 20:19:32 -05:00
Michael
e6f0e3c23e
Don't calculate the blurhash on images without a size
2022-12-20 22:32:24 +00:00
Michael
69a9f9033d
Three systems added to the federation statistics
2022-12-20 22:29:53 +00:00
Michael
de1c0f4c13
Don't display Diaspora reshares
2022-12-20 19:25:57 +00:00
Michael
4db4d1843d
Merge remote-tracking branch 'upstream/develop' into diaspora-reshare
2022-12-20 06:58:36 +00:00
Philipp
8b3a9fc58a
Merge pull request #12485 from annando/errors-warnings
...
Measures against several warnings and errors in the log
2022-12-20 07:48:59 +01:00
Michael
bdc865afae
Measures against several warnings and errors in the log
2022-12-20 06:22:11 +00:00
Tobias Diekershoff
c84f18ef66
bump VERSION to 2023.03-dev
2022-12-20 06:52:15 +01:00
Tobias Diekershoff
eeadc00e83
bump VERSION to 2022.12
2022-12-20 06:48:39 +01:00
Michael
e733adcaae
Issue 12419: Quickhack to make GoToSocial work
2022-12-19 21:21:06 +00:00
Michael
d39f4014e4
Fix delivery problems with "reachable" test
2022-12-19 19:41:04 +00:00
Philipp
20374ab5a2
Merge pull request #12447 from MrPetovan/bug/12441-profile-contacts
...
Retrieve contact records for the page visitor in several modules
2022-12-19 17:14:43 +01:00
Philipp
c9f92f41fb
Merge pull request #12479 from MrPetovan/bug/deprecated
...
Fix several Deprecated notices
2022-12-19 17:13:12 +01:00
Hypolite Petovan
f2188835e7
Add logging and default value when JSON encode->decode fails in JsonLD::compact
...
- Address part of https://github.com/friendica/friendica/issues/12011#issuecomment-1357768936
2022-12-19 10:22:05 -05:00
Hypolite Petovan
06ea61f0ed
Provide default value for system.banner config key
...
- Address part of https://github.com/friendica/friendica/issues/12011#issuecomment-1357768936
2022-12-19 10:17:57 -05:00
Hypolite Petovan
6a17223289
Ward against null value in language key of item array in Mastodon\Status object
...
- Address part of https://github.com/friendica/friendica/issues/12011#issuecomment-1357768936
2022-12-19 10:11:12 -05:00
Hypolite Petovan
b1b0bfc280
Don't compute system.update_interval when it's -1 (disabled)
...
- Address part of https://github.com/friendica/friendica/issues/12011#issuecomment-1357768936
2022-12-19 10:05:21 -05:00
Hypolite Petovan
eb9af005f0
Fix module instantiation in Profile\Index module
...
- Address https://github.com/friendica/friendica/issues/11992#issuecomment-1357441775
2022-12-19 09:50:42 -05:00
Hypolite Petovan
29330a4205
Remove DI dependency in Profile\Status module
2022-12-19 09:50:42 -05:00
Hypolite Petovan
9da21bf680
Remove fallback contact query from Model\Contact::photoMenu
...
- Correct contact is now supplied to the method
2022-12-19 09:50:18 -05:00
Hypolite Petovan
2d9633a595
Retrieve contact records for the page visitor in Profile\Common module
2022-12-19 09:50:18 -05:00
Hypolite Petovan
472bde99a4
Retrieve contact records for the page visitor in Contact\Contacts module
2022-12-19 09:50:17 -05:00
Hypolite Petovan
fca1abbafe
Retrieve contact records for the page visitor in Profile\Contacts module
2022-12-19 09:50:17 -05:00
Hypolite Petovan
36a8962333
Remove DI dependency in Contact\Hovercard module
2022-12-19 09:50:17 -05:00
Hypolite Petovan
7458721f9f
Remove DI dependency in Profile\Common module
2022-12-19 09:50:16 -05:00
Hypolite Petovan
a633532475
Remove DI dependency in Contact\Contacts module
2022-12-19 09:50:16 -05:00
Hypolite Petovan
cef408c842
Remove DI dependency in Module\Profile\Contacts
2022-12-19 09:50:16 -05:00
Michael Vogel
8f22b4f33d
Update src/Model/GServer.php
...
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2022-12-19 15:22:21 +01:00
Michael
feb74b4d9a
Don't perform a delivery to failing servers
2022-12-19 09:30:56 +00:00
Tobias Diekershoff
86a486f62b
Merge pull request #12472 from MrPetovan/bug/12466-profile-photos-aside
...
Remove VCard for owner in Profile\Photos module
2022-12-19 07:38:13 +01:00
Tobias Diekershoff
9d38671ec9
Merge pull request #12471 from MrPetovan/bug/12468-bbcode-img-code
...
Skip literal text in ActivityPub\Transmitter::removePictures
2022-12-19 07:03:31 +01:00
Tobias Diekershoff
b4db8fe8d2
Merge pull request #12469 from MrPetovan/bug/12462-tos-rules
...
Skip blank lines in Tos module
2022-12-19 06:58:42 +01:00