Commit Graph

9327 Commits

Author SHA1 Message Date
Balázs Úr 4171ff7563
Add Danish language to list of native language names 2022-05-03 21:13:47 +02:00
Michael 4ba28e0199 Merge remote-tracking branch 'upstream/2022.05-rc' into performance 2022-05-03 08:23:09 +00:00
Michael 49ec5e5e6e Check for empty value 2022-05-03 08:20:48 +00:00
Michael e6440471ae Throw an error when the feed is invalid 2022-05-03 08:20:26 +00:00
Michael 690682a37e Only send "accept" headers on some HTTP methods 2022-05-03 08:20:05 +00:00
Michael 632a98965c Fetch contact via uri-id to improve performance 2022-05-03 08:19:35 +00:00
Michael 3163760343 Added configuration for the bulk delivery 2022-05-02 17:34:40 +00:00
Michael 6e394ac6ff Whitespaces removed 2022-05-02 14:36:21 +00:00
Michael 76789acace Reduce network request by transmitting to shared inboxes 2022-05-02 14:35:57 +00:00
Michael fcb245947e Fetch the receiver list from sharedinbox or personal inbox 2022-05-02 06:10:36 +00:00
Michael 9c2fe81ac6 Transmit via the sharedInbox 2022-05-02 05:53:11 +00:00
Michael a9990db98c Clean the worker queue directly from cron 2022-05-02 05:16:02 +00:00
Michael 40aa67f8be Bulk transmission for AP posts 2022-05-02 05:15:27 +00:00
Michael 13e4144ba6 Use a centralized function to check the priority 2022-05-01 09:29:31 +00:00
Michael f7b6507438 More checks for strange priorities 2022-05-01 08:58:48 +00:00
Michael 19c1b31ab2 Only add valid values to the worker 2022-05-01 07:03:10 +00:00
Michael e19681684b Fix worker priorities 2022-05-01 06:57:29 +00:00
Michael 1f43332a1d Only fetch category when it exists 2022-04-30 06:57:22 +00:00
Michael fb3353d4bd Separate loop to fetch thread parents 2022-04-30 06:19:18 +00:00
Hypolite Petovan 18c642f2a7
Merge pull request #11451 from atjn/update-icon
Update default icon
2022-04-29 07:25:51 -04:00
Michael a2452b33eb Add missing fields to collection 2022-04-29 10:13:23 +00:00
Michael 8dc0ab9bb3 Test: Disable magiclink in posts 2022-04-29 09:49:16 +00:00
Michael d3de2497bc Use gsid for the network name 2022-04-29 07:47:24 +00:00
Michael d44641e58c Fetch avatar by id 2022-04-29 07:30:13 +00:00
Michael 1326239576 Reduce the amount of queries 2022-04-29 05:32:12 +00:00
Hypolite Petovan aa65e3032d
Merge pull request #11455 from annando/update-avatar
Update contact when the avatar hadn't been found
2022-04-28 14:29:46 -04:00
Michael 9eafcf8484 Update contact when the avatar hadn't been found 2022-04-28 16:46:52 +00:00
atjn 420f4c54b7 Update app manifest icons 2022-04-28 13:26:59 +02:00
atjn 31ed9b450d Update default icon 2022-04-28 12:41:26 +02:00
Michael 144c9f00f4 Fix: Show reshared posts on the contact page 2022-04-27 03:25:47 +00:00
Michael 171354181d Use central function to fetch the global directory 2022-04-26 18:33:58 +00:00
Michael 83e311decb Standards 2022-04-25 13:49:17 +00:00
Michael 990eea2c4e We now store uncommon endpoints 2022-04-25 13:45:03 +00:00
Tobias Diekershoff b89f727cca
Merge pull request #11438 from MrPetovan/bug/11371-settings-forms
Enclose account settings panels in separate forms
2022-04-25 07:37:59 +02:00
Michael 069a008ca4 Removed unused tag entries 2022-04-24 15:27:20 +00:00
Hypolite Petovan 967c438312 Enclose account settings panels in separate forms
- This prevents auto-filled password fields to abort settings save
- Move single-use settings/nick_set template HTML to settings/account
2022-04-24 08:36:53 -04:00
Hypolite Petovan 90368d7484 Remove unused settings_post and settings_form hooks
- Addons should use the addon_form hook instead
2022-04-24 01:21:49 -04:00
Hypolite Petovan 64330f9895 Move /settings to src/ 2022-04-24 01:21:48 -04:00
Michael 4af6e730d3 Use different collections 2022-04-23 12:32:29 +00:00
Michael 0a3c5cc40c Add the function documentation 2022-04-23 11:43:30 +00:00
Michael 060597f619 Store the tag type for the post targets 2022-04-23 11:39:19 +00:00
Michael 9b646dad97 API: We can now display polls 2022-04-22 19:24:22 +00:00
Michael f34b7b91fa API: New Mastodon endpoints added 2022-04-21 19:58:56 +00:00
Michael 666b3bbca3 Use "received" for starred posts 2022-04-21 13:58:24 +00:00
Michael 5a41c2039a Order starred posts and posts with mention by the last comment date 2022-04-21 05:52:08 +00:00
Michael eb1f38df22 Issue 11427: id values of OrderedCollections have to contain the page number 2022-04-21 04:29:08 +00:00
Michael 2236e5cfb0 Issue 11425: Additional sorting by creation date 2022-04-20 21:03:33 +00:00
Michael 94a8f430e3 Avoid warning " Undefined variable $browsershare" 2022-04-20 12:03:09 +00:00
Michael 8d25094719 Fix test 2022-04-20 06:33:14 +00:00
Michael 834844573b We can now store incoming questions 2022-04-20 06:28:02 +00:00
Michael 62b31900a6 Renamed "share" with "share via" 2022-04-19 21:04:55 +00:00
Michael 0380a3e216 Fix: The language detection only searched for farsi 2022-04-19 06:16:44 +00:00
Michael cca7d40a8f Fix: Webfinger returned xml when json has been requested and vice versa 2022-04-18 05:42:05 +00:00
Hypolite Petovan 627e91f209
Merge pull request #11413 from annando/vote-preparation
Preparation for storing incoming polls
2022-04-15 10:22:41 -04:00
Michael eaa8163201 Preparation for storing incoming polls 2022-04-15 09:11:50 +00:00
Michael 0696da3d1b Fixes notice 2022-04-15 04:14:21 +00:00
Michael 0d8cf06e4a Experimental feature to enter a custom creation date 2022-04-13 05:31:32 +00:00
Michael 30e5ef928a Avoid wrong server type detection / Owncast added 2022-04-12 05:34:34 +00:00
Michael 62367923e0 Fix several notices 2022-04-11 18:57:30 +00:00
Hypolite Petovan 3842f02b02
Merge pull request #11402 from annando/featured-endpoint
We now offer an endpoint for featured posts
2022-04-11 11:17:56 -04:00
Michael c88d306a41 Use the correct content type 2022-04-11 06:07:50 +00:00
Michael 989ac2fda8 Some more "exit" replaced 2022-04-10 11:03:24 +00:00
Michael 4a22034be6 Unified output via the "httpExit" function 2022-04-10 08:31:55 +00:00
Michael d15023fe4b Unified JSON exit 2022-04-09 11:58:01 +00:00
Michael 344e12c4fc Use $request 2022-04-09 08:17:26 +00:00
Michael a1e675ded1 use jsonexit 2022-04-09 03:41:24 +00:00
Michael d7df0825db We now offer an endpoint for featured posts 2022-04-08 21:25:31 +00:00
Hypolite Petovan 4eecf733e1
Merge pull request #11389 from nupplaphil/feat/http_client_arg
Introduce explicit HttpClient "Accept" parameter
2022-04-08 15:05:40 -04:00
Philipp 3033f79529
head fixings 2022-04-08 20:48:57 +02:00
Philipp 8e2cc678dc
head fixings 2022-04-08 20:41:25 +02:00
Philipp 277cd51433
fix doc 2022-04-08 20:11:51 +02:00
Michael Vogel b2b8b23ed6
Update src/Model/Contact.php
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2022-04-08 13:59:43 +02:00
Michael 69b7923df2 Use centralized function to fetch query results 2022-04-08 06:04:50 +00:00
Michael 2764859350 Remove unfeatured posts from collection 2022-04-08 04:49:23 +00:00
Michael 6c8ea1d0d8 Updated messages.po / type added to query 2022-04-08 04:17:52 +00:00
Michael 75bc4eccb7 Display featured posts for contacts 2022-04-07 21:52:25 +00:00
Michael 65071ffc9e Issue 11393: Fix failing preview 2022-04-06 16:26:51 +00:00
Michael 5a3fe900f0 Fix test 2022-04-06 15:32:14 +00:00
Michael a1dd299eb3 Preparations for "featured" posts 2022-04-06 13:34:11 +00:00
Michael e6ea015cb4 "Person" is "Account" 2022-04-05 20:06:04 +00:00
Michael c0b3c527d6 Added processing of incoming block notices 2022-04-05 19:14:29 +00:00
Michael dcbca0c6a3 Store "View" activity from Peertube 2022-04-05 07:48:38 +00:00
Michael a5a5a4b603 Cleaned code 2022-04-05 05:53:17 +00:00
Michael 61abc6377d Preparation for "Featured" collection added 2022-04-04 23:07:44 +00:00
Michael e6caed7b5f Merge remote-tracking branch 'upstream/develop' into new-acitivities 2022-04-04 16:05:02 +00:00
Michael aa2a32d16f Store the "EmojiReact" activity 2022-04-04 16:03:53 +00:00
Hypolite Petovan eceaf782cc
Merge pull request #11385 from annando/ap-receiver-unhandled
Added handling of some previously unhandled activities
2022-04-04 10:59:35 -04:00
Philipp 04866195b4
Remove accept parameter for head/post again 2022-04-03 19:33:09 +02:00
Michael 1475f53e21 Merge branch 'ap-receiver-unhandled' of github.com:annando/friendica into ap-receiver-unhandled 2022-04-03 07:45:19 +00:00
Michael 39a1745361 Prevent the warning of an Undefined array key "object_object_type" 2022-04-03 07:45:15 +00:00
Michael 5290f0cd51 Improved handling of invalid links 2022-04-03 07:31:42 +00:00
Michael 029daef997 Only use and accept valid http links as links to an external resource 2022-04-03 07:21:36 +00:00
Michael Vogel 5fe75ed50d
Update src/Protocol/ActivityPub/Receiver.php
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2022-04-02 23:04:44 +02:00
Philipp 4aeccd3157
Added license 2022-04-02 21:22:14 +02:00
Philipp e299fc67c8
Introduce "accept_header" as specific argument to the http client 2022-04-02 21:16:53 +02:00
Philipp 73c3b21665
Move ACCEPT constants to own "enum" class 2022-04-02 20:26:11 +02:00
Michael 1db3143dc5 added empty object type 2022-04-01 21:27:40 +00:00
Michael 71afbabbd8 Added handling of some previously unhandled activities 2022-04-01 11:20:17 +00:00
Michael 2ca51f752d Use appropriate "accept" values 2022-03-30 14:39:53 +00:00
Michael 3e21b035b7 Added logging 2022-03-29 17:26:31 +00:00
Michael 94b7c1fc77 Use a more specific "accept" value 2022-03-29 14:02:10 +00:00
Michael 28e3eee91b Add "Accept" to "head" 2022-03-29 13:34:54 +00:00
Michael 908d2594ed Use "HttpClientOptions" 2022-03-29 08:57:38 +00:00
Michael 1fae0123ec Some more "accept" parameters are added 2022-03-29 06:24:20 +00:00
Michael 51b2bf6f70 Avoid returning of the actor when requesting friendica/json 2022-03-28 13:12:45 +00:00
Michael ff70f74952 "accept" constants introduced and used 2022-03-28 10:33:06 +00:00
Philipp 80a533ddab
Add Default Accept for HTTP Calls 2022-03-26 22:15:44 +01:00
Tobias Diekershoff c1fd163b97
Merge pull request #11376 from annando/no-group
Don't display Peertube groups as forums
2022-03-24 13:19:34 +01:00
Michael 8c34c3b8ae Don't display Peertube groups as forums 2022-03-24 11:30:32 +00:00
Michael 212eba327b Improve the compatibility with Lemmy 2022-03-24 10:57:55 +00:00
Michael 6f43821ebf Issue 11368: Prevent namespace prefix warning 2022-03-22 21:07:35 +00:00
Hypolite Petovan 2438eb78dd
Merge pull request #11369 from annando/empty-item
Prevent further processing of incoming posts when thay are rejected
2022-03-22 08:54:20 -04:00
Michael 53ba68e222 Remove "blubb" 2022-03-22 12:31:14 +00:00
Michael 45199b498d Prevent further processing of incoming posts when thay are rejected 2022-03-22 12:28:47 +00:00
Michael 13addaf901 Always provide the title variable 2022-03-22 07:07:33 +00:00
Michael be016b0c45 Prioritize the title over the content warning 2022-03-22 07:00:44 +00:00
Michael a2a5f05a19 Issue 11310: Show pinned posts when not logged in 2022-03-21 22:58:23 +00:00
Michael 4dace46159 Fix link to post in notification 2022-03-20 19:59:35 +00:00
Hypolite Petovan e738428876
Merge pull request #11360 from annando/announce-notification
Don't create empty announce notifications
2022-03-19 14:53:34 -04:00
Michael e4a5094c90 Don't show double introductions 2022-03-19 18:38:59 +00:00
Michael 91905bea89 Don't create empty announce notifications 2022-03-19 17:53:41 +00:00
Hypolite Petovan 014c7b5943
Merge pull request #11359 from annando/notification
Avoid empty notifications / fixed link to the content
2022-03-19 11:31:46 -04:00
Michael fb6a435a6a Avoid empty notifications / fixed link to the content 2022-03-19 15:25:00 +00:00
Michael 351e9a307c Fixed placeholder 2022-03-19 11:24:09 +00:00
Michael 4e45987f74 Merge remote-tracking branch 'upstream/develop' into fetch-usage 2022-03-19 11:21:38 +00:00
Hypolite Petovan 4329f5381b
Merge pull request #11355 from annando/notifications
Fixes for the notifications
2022-03-19 06:52:04 -04:00
Michael aef9cb9992 Moved "ignore" check to a better location 2022-03-19 09:48:50 +00:00
Michael 1fe756b5b6 Fixes for the notifications 2022-03-19 09:27:49 +00:00
Hypolite Petovan 9eb6299f19 Check array key existence in ActivityPub\Transmitter::createPermissionBlockForItem
- APContact::getByURL can return empty array
- Address https://github.com/friendica/friendica/issues/11218#issuecomment-1066753232
2022-03-19 03:15:08 -04:00
Michael 0aa229489f Improved function description 2022-03-18 07:24:45 -04:00
Michael 040abc7743 Use a nicer GUID style format 2022-03-18 07:24:44 -04:00
Hypolite Petovan 04ac4841f9 Add support for notification visibility settings 2022-03-16 22:03:26 -04:00
Michael 0b10806ce3 Fix the problem that the post update never stopped on larger systems 2022-03-16 22:00:34 -04:00
Michael Vogel f5bcc4ad4b
Merge pull request #11346 from MrPetovan/bug/11343-memcached-bad-key
Suppress a couple MemcachedException
2022-03-16 15:19:40 +01:00
Tobias Diekershoff 8d64cf4f9b
typo 2022-03-16 06:25:21 +01:00
Hypolite Petovan 7b9e62198e Suppress a couple MemcachedException
- Replace URL by uri-id in apcontact
- Replace date with a space and nurl by nick and Zulu time in mod/poco
2022-03-15 10:54:00 -04:00
Hypolite Petovan a07f840c74 Add correct ordering for detailed notifications 2022-03-15 07:05:59 -04:00
Tobias Diekershoff 02b6ac3ed3
limit parameter was missing from docblock 2022-03-15 08:46:26 +01:00
Tobias Diekershoff 12038d45d0
PHP deprecation warning due wrong order of function parameters
With PHP 8.0 I got the following PHP Deprecation message

```
PHP Deprecated:  Required parameter $limit follows optional parameter $ids in src/Worker/UpdateContacts.php on line 104
```

this PR fixes the wrong order of the parameters.
2022-03-15 08:44:17 +01:00
Michael Vogel e252b5972e
Merge pull request #11336 from MrPetovan/task/4639-soapbox-intro-notification
Add exception when message is empty in FormatteNavNotification::createFromNotification
2022-03-15 07:09:24 +01:00
Hypolite Petovan 07d4cdbdde Fix misleading notification message strings
- The mentioned title is from the top-level post, not the liked post
2022-03-14 22:56:46 -04:00
Hypolite Petovan 36e85b01c6 Hide like notifications from menu again 2022-03-14 22:56:46 -04:00
Hypolite Petovan 73c7b88fb2 Add exception when message is empty in FormatteNavNotification::createFromNotification
- Filter out message less notifications in Ping
2022-03-14 22:56:44 -04:00
Hypolite Petovan 371b2b22bd
Merge pull request #11333 from annando/feed-guid
Don't use the GUID value directly
2022-03-14 18:02:29 -04:00
Michael 7940b31685 Don't use the GUID value directly 2022-03-14 21:09:14 +00:00
Hypolite Petovan e6f745bcb1 Delete follow notification on unfollow
- Fix translation string typo
2022-03-14 07:58:39 -04:00
Hypolite Petovan 49971b1465 Switch data source from notify to notification in Module\Notifications\Ping
- Change unused FormattedNotification classes to FormattedNavNotification classes
2022-03-14 07:58:38 -04:00
Hypolite Petovan 1ae7cac236 Move mod/ping to module class 2022-03-14 07:57:41 -04:00
Hypolite Petovan 5a12bd87f3 Replace Javascript notification string formatting with Smarty templates 2022-03-14 07:56:58 -04:00
Hypolite Petovan b7cee324b0 Add legacy notification endpoint for deprecated Notify entity
- Add dependencies to Notifications\Notification module class
2022-03-14 07:56:21 -04:00
Hypolite Petovan deafdcde95 Use public contact ID in Model\Post\UserNotification::insertNotification
- Add localRelationship dependency to Notification factory
- Remove dependencies from Factory\Notification->getMessageFromNotification method
2022-03-14 07:56:20 -04:00
Hypolite Petovan 7ce97459d4 Deprecated the notify table/classes 2022-03-14 07:56:20 -04:00
Michael 0956d1dd64 Don't send forum posts to the user's followers 2022-03-14 06:07:51 +00:00
Michael 2642996171 Send community posts only to the community 2022-03-13 19:31:21 +00:00
Michael ca086b880b Some small improvements for importing feeds 2022-03-13 15:29:07 +00:00
Michael 12d7c99f46 Don't send notifications for activities caused by the community contact 2022-03-13 05:44:29 +00:00
Hypolite Petovan 9e3dbfab3e
Merge pull request #11323 from annando/direction
Issue 11309: improved check for wanted posts
2022-03-12 13:42:08 -05:00
Michael 314bf92ead Added Documentation 2022-03-12 17:29:46 +00:00
Michael fb13890341 Added parameter values 2022-03-12 15:27:56 +00:00
Michael 8c778ca02e Improved completion check for AP 2022-03-12 11:17:33 +00:00
Michael 56cd98b38b Further improved logging 2022-03-12 07:48:31 +00:00
Michael c1bb1cf0fc Improved logging 2022-03-12 07:34:30 +00:00
Michael Vogel 5c4871fe6d
Merge pull request #11321 from MrPetovan/bug/11319-wrong-path-subfolder-install
Normalize base URL usage in admin templates
2022-03-12 08:10:07 +01:00
Michael 5a16a424ac Issue 11309: improved check for wanted posts 2022-03-12 07:08:10 +00:00
Michael 073a6afaaf Reduce amount of notifications by communities 2022-03-12 04:20:19 +00:00
Hypolite Petovan d15ebb6fd3 Normalize base URL usage in admin templates 2022-03-11 23:14:21 -05:00
Michael 5eb647585d Issue 11315: Fix for all receivers in "to" 2022-03-11 20:39:03 +00:00
Michael f264923cad Issue 11309: Check if a post is wanted 2022-03-11 14:00:05 +00:00
Michael 2f97d61a09 Estimate active server users when not provided by the system 2022-03-10 21:50:00 +00:00
Michael 03d38d9e35 Show permissions for all posts when possible 2022-03-10 07:38:12 +00:00
Michael 38fbe281f9 API: Fixed the bookmarking 2022-03-08 22:38:06 +00:00
Hypolite Petovan 00aa905c15
Merge pull request #11307 from annando/api-reply-fix
API: Fix "in_reply_to_status_id"
2022-03-08 15:53:12 -05:00
Hypolite Petovan 0f9a239d59
Merge pull request #11306 from annando/abstract-space
Replace abstract content with a space to prevent missing spaces
2022-03-08 15:52:48 -05:00
Hypolite Petovan c13ae36256
Merge pull request #11305 from annando/api-spoiler
API: Improve support for the summary field
2022-03-08 15:48:46 -05:00
Michael 4803b99157 API: Fix "in_reply_to_status_id" 2022-03-08 20:46:26 +00:00
Michael e0295abdab Replace abstract content with a space to prevent missing spaces 2022-03-08 19:58:55 +00:00
Michael e0468ac914 API: Improve support for the summary field 2022-03-08 18:32:09 +00:00
Michael 8039ab731f Type hints reverted 2022-03-08 18:26:59 +00:00
Hypolite Petovan 285ff75482
Merge pull request #11294 from annando/fix-mail-setting
Fix storing mail settings
2022-03-06 10:17:02 -05:00
Michael Vogel acba7d25a0
Apply suggestions from code review
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2022-03-06 14:15:59 +01:00
Michael 31dbdd3677 variable type for the return value is added 2022-03-06 12:21:27 +00:00
Michael 903bc9b679 Improved support for Mastodon style content warnings 2022-03-06 11:49:55 +00:00
Michael Vogel 1ec1adf904
Apply suggestions from code review
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2022-03-06 05:49:49 +01:00
Michael 421dd028ce Fix storing mail settings 2022-03-05 13:08:09 +00:00
Michael 5539e42743 API: Support for the "direct" visibility 2022-03-05 06:14:30 +00:00
Michael 15de709b89 API: We can now post to groups via the Mastodon endpoint 2022-03-04 05:50:33 +00:00
Michael f059e56e0f Fix test / Use new expandTags function 2022-03-02 17:17:07 +00:00
Michael f853d58198 API: Forum mentions are now working 2022-03-02 06:59:07 +00:00
Michael 1f1d3b2578 API: Only display active incoming contact requests 2022-03-02 05:05:49 +00:00
Michael 772294494e API: Fix display of reshares / return value of activities 2022-02-28 20:10:42 +00:00
Hypolite Petovan f36d4891bc
Merge pull request #11282 from annando/api-fix
API: several fixes to the Twitter/Statusnet API
2022-02-25 16:11:18 -05:00
Michael 6415fc62a0 Fix missing field 2022-02-25 19:27:25 +00:00
Michael bf5c8a2c43 API: several fixes to the Twitter/Statusnet API 2022-02-25 19:16:40 +00:00
Hypolite Petovan 419fe67c6c
Merge pull request #11265 from k-alin/6606-k-alin-mysql-unix-socket
Enable MySQL unix socket connection
2022-02-25 10:36:43 -05:00
k-alin e4cfd4a7c3
Update src/Database/Database.php
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2022-02-25 16:09:54 +01:00
k-alin 8a10b0c635 add socket to database settings in the autoinstaller 2022-02-25 15:01:02 +01:00
k-alin 33c4fbf2a6
Update src/Database/Database.php
Correct indent

Co-authored-by: Philipp <admin+Github@philipp.info>
2022-02-25 12:09:54 +01:00
k-alin 470be2b5e4
Update src/Database/Database.php
Correct indent

Co-authored-by: Philipp <admin+Github@philipp.info>
2022-02-25 12:09:30 +01:00
k-alin 335be6f032
Update src/Database/Database.php
Correct indent

Co-authored-by: Philipp <admin+Github@philipp.info>
2022-02-25 12:09:12 +01:00
Hypolite Petovan cddead2343 Move follow revoke protocol to worker task
- Switch to public contact for revoke_follow hook
2022-02-24 09:35:55 -05:00
Hypolite Petovan 6a1f9a7fa3 Move unfollow protocol to worker task
- Add uid parameter to unfollow hook
- Rework and unify Contact::unfollow, Contact::removeSharer and Contact::terminateFriendship
- Add missing twitterUser property to Twitter\Friendships\Destroy module
2022-02-24 09:35:54 -05:00
Hypolite Petovan 48e2963ac7 Remove unused variable in Core\Worker::defer 2022-02-24 09:35:54 -05:00
Hypolite Petovan 52f5d924b7 Replace remaining instances of DBA::update('contact') with Contact::update()
- This was breaking the synchronisation between the contact and user-contact tables
2022-02-24 09:35:54 -05:00
Michael d32b9d5d95 Display the BCC receiver when it is the local user 2022-02-24 07:09:34 +00:00
Hypolite Petovan 1d779c6193 Ensure the private message recipient is valid in Mail::send
- Arbitrary input could be used to circumvent most restrictions regarding recipients (except contact relationship)
2022-02-23 21:30:18 -05:00
Michael 59630a2c82 Improve the name of the "followers" receiver 2022-02-23 20:18:37 +00:00
Michael Vogel 948405a486
Merge pull request #11267 from MrPetovan/task/11264-mastodon-api-version
Update Mastodon API version string to include Mastodon version compatibility
2022-02-23 05:38:25 +01:00
Michael ec0b05d826 Display announces identital for starting posts and comments 2022-02-21 05:17:54 +00:00
Hypolite Petovan d7b573c6d7 Update Mastodon API version string to include Mastodon version compatibility 2022-02-20 20:22:39 -05:00
Hypolite Petovan e0ea51818e Add constructors to a couple of Mastodon API value objects 2022-02-20 16:17:03 -05:00
Michael 2321c7a55b Updated messages.po 2022-02-20 20:47:08 +00:00
Michael d6725437b0 Merge remote-tracking branch 'upstream/develop' into display-permissions 2022-02-20 20:45:32 +00:00
Michael 39e820e6a3 Display the post receivers 2022-02-20 19:25:55 +00:00
k-alin ff439272b9 mysql connection via socket if location of mysqld.sock was specified 2022-02-20 17:45:51 +01:00
k-alin 50580fd04c
Merge branch 'friendica:develop' into 6606-k-alin-mysql-unix-socket 2022-02-20 17:27:03 +01:00
Hypolite Petovan c86cc83524
Merge pull request #11260 from mkljczk/develop
API: add list members editing
2022-02-20 09:45:25 -05:00
marcin mikołajczak 0209892631 Apply suggestions
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-02-20 14:10:57 +01:00
Tobias Diekershoff 446775cdc8
Merge pull request #11261 from annando/notices
Avoid warning and notice
2022-02-20 07:23:53 +01:00
Michael Vogel d5373c583b
Merge pull request #11258 from MrPetovan/bug/11234-categories-profile
Show only the user's categories on their profile
2022-02-20 06:35:37 +01:00
Michael 311c1fdd81 Avoid warning and notice 2022-02-20 05:14:36 +00:00
marcin mikołajczak 9c6f6bcb95 API: add list members editing
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-02-19 23:22:54 +01:00
Michael 00f39cd308 Reverted change 2022-02-19 20:32:19 +00:00
Michael 22952f88ca SImplify code 2022-02-19 19:45:27 +00:00
Michael 9aa0f6f547 Merge remote-tracking branch 'upstream/develop' into conversation-receivers 2022-02-19 13:52:45 +00:00
Michael c867581530 Store the receivers of a post in the tags 2022-02-19 13:31:49 +00:00
Tobias Diekershoff 32c4d8c565
Merge pull request #11256 from MrPetovan/bug/notices
Check for array content before querying keys in Worker\Notifier
2022-02-19 07:44:17 +01:00
Tobias Diekershoff 4770903f54
Merge pull request #11257 from MrPetovan/bug/11212-smarty-4-php8
Switch to Smarty 4
2022-02-19 07:38:28 +01:00
Hypolite Petovan 30dcf3380c Show only the user's categories on their profile 2022-02-18 23:58:23 -05:00
Hypolite Petovan 4fe2257d8e Prevent warnings on undefined Smarty template variables 2022-02-18 22:44:11 -05:00
Hypolite Petovan 35abf33c05 Check for array content before querying keys in Worker\Notifier
- Address https://github.com/friendica/friendica/issues/11218#issuecomment-1045137358
2022-02-18 20:25:18 -05:00
Hypolite Petovan c03ff7833b
Merge pull request #11253 from annando/forum3
More rework to make private communities working
2022-02-18 12:19:57 -05:00
Michael Vogel 4c39faca95
Merge pull request #11249 from MrPetovan/bug/11248-getinfofromurl-cache-key
Hash the URL before using it as cache key in Util\Images::getInfoFromURLCached
2022-02-18 17:53:20 +01:00
Tobias Diekershoff 4c7d3a6371
Merge pull request #11255 from MrPetovan/task/11245-thread-completion-like
Relax comparison with pconfig system.accept_only_sharer value
2022-02-18 17:09:42 +01:00
Hypolite Petovan c376081d0d Relax comparison with pconfig system.accept_only_sharer value
- DI::pConfig()->get returns a string value, not an integer
- Removed superfluous default values now that we aren't doing strict type checking
2022-02-18 09:32:30 -05:00
Hypolite Petovan 17d49422b4 Hash the URL before using it as cache key in Util\Images::getInfoFromURLCached
- This prevents oversized URL from stunting the database cache
2022-02-18 09:19:36 -05:00
Michael 39724d5079 Add the mentions 2022-02-18 09:12:33 +00:00
Michael ebb4c0f947 tests 2022-02-18 06:12:02 +00:00
Michael 0ce756596e Tests again 2022-02-18 05:56:17 +00:00
Michael 830a91e586 Avoid failed test 2022-02-18 05:34:18 +00:00
Michael 7a5a8c8d68 Improve look of reshared items on the forum profile 2022-02-17 23:06:57 +00:00
Michael 49dd97e5fd User lower case 2022-02-17 21:51:47 +00:00
Michael 234dac49b4 Rrepeat comments as well 2022-02-17 21:44:59 +00:00
Michael 1b6b6bcc6d Renamed function 2022-02-17 07:53:24 +00:00
Michael 51fb265621 Merge remote-tracking branch 'upstream/develop' into forum3 2022-02-17 07:11:50 +00:00
Michael Vogel 618dda7dd2
Merge pull request #11246 from MrPetovan/task/11245-thread-completion-like
Expand system.accept_only_sharer pconfig value to include previous behavior with likes
2022-02-17 08:02:19 +01:00
Michael 9ac24a0f36 More rework to make private communities working 2022-02-16 22:56:55 +00:00
Hypolite Petovan 6c0dbc1775
Merge pull request #11251 from annando/forum2
Fix for private communities
2022-02-15 20:16:07 -05:00
Hypolite Petovan 7dadc7f6dc
Merge pull request #11250 from nupplaphil/bug/redis_pw
Don't use empty values for redis password and port
2022-02-15 20:15:06 -05:00
Michael 33edfc6a5f Fix for private communities 2022-02-15 23:51:13 +00:00
Philipp be240ca500
Config Console Show 'NULL' for null-values 2022-02-15 23:10:41 +01:00
Philipp 4e58c6981c
Don't use empty, but not null values for redis password and port 2022-02-15 23:04:43 +01:00
Hypolite Petovan 3b6c40e2e6 Check the existence of the uid field before accessing it in Module\Photo
- Address https://github.com/friendica/friendica/issues/11218#issuecomment-1039512291
2022-02-15 15:59:35 -05:00
Hypolite Petovan 99979019bf Expand system.accept_only_sharer pconfig value to include previous behavior with likes 2022-02-15 15:54:36 -05:00
Hypolite Petovan 361fdccdc7
Merge pull request #11242 from annando/private-forums
Private forums are now working via AP
2022-02-15 12:06:34 -05:00
Michael d019ef57d2 Database version increased, code simplified 2022-02-15 15:44:44 +00:00
Michael Vogel 4d274cc3ea
Merge pull request #11244 from MrPetovan/bug/11232-post-media-order
Use expected order for post medias
2022-02-15 16:38:36 +01:00
Hypolite Petovan f329d5c067
Merge pull request #11241 from annando/timing
Workaround for timing problems / Avoid a notice in the scheduled posts
2022-02-15 10:20:04 -05:00
Hypolite Petovan 9ae0234bb5 Use expected order for post medias
- This fixes the wrong display order of post pictures
2022-02-15 09:53:24 -05:00
Michael 29d83c0ffb Block communication with Diaspora for communities 2022-02-15 07:08:02 +00:00
Michael 2b0518ac04 unset several table fields before distribution 2022-02-15 06:21:46 +00:00
k-alin 31ff583c5e mysql connection via unix sockets (mysqli + PDO) 2022-02-14 23:18:41 +01:00
Michael d404f15312 Improve local forum distribution 2022-02-14 22:04:33 +00:00
Michael a5a1c81790 Fetch the user id when not provided 2022-02-13 16:42:43 +00:00
Michael 9c60b4127b Merge remote-tracking branch 'upstream/develop' into private-forums 2022-02-13 07:03:20 +00:00
Tobias Diekershoff 41f502266e
Merge pull request #11240 from annando/thread-completion
Avoid thread completion on activities
2022-02-13 07:51:55 +01:00
Michael ee3a8ccb3b No notifcations for forum / fetch user for fetching content 2022-02-13 05:45:06 +00:00
Michael e394143148 Private forums are now working via ActivityPub 2022-02-12 18:38:36 +00:00
Michael Vogel 6bc69f3353 Workaround for timing problems / Avoid a notice in the scheduled posts 2022-02-12 18:27:58 +01:00
Michael cdee2b44db Avoid thread completion on activities 2022-02-12 13:05:56 +00:00
Tobias Diekershoff d65357dd92
added two help texts in the admin panel site config 2022-02-10 09:04:48 +01:00
Hypolite Petovan 1b73e4d267
Merge pull request #11230 from annando/account-type
Use "account-type" instead of "page-flags"
2022-02-09 22:23:55 -05:00
Hypolite Petovan 0e6fe8d8ad
Merge pull request #11228 from annando/no-db-exception
Don't throw an exception when the database query fails
2022-02-09 22:16:56 -05:00
Michael 5b46b41226 New function to add group members from a forum 2022-02-09 21:34:25 +00:00
Michael 9a764516d0 Use the "contact-type" instead of "forum" or "prv" 2022-02-09 06:52:16 +00:00
Michael b857c26999 Use "account-type" instead of "page-flags" 2022-02-09 05:56:12 +00:00
Michael 14f0a1a1ed Don't throw an exception when the database query fails 2022-02-08 21:28:42 +00:00
Michael f87b80266c Display followers for followers of private forums 2022-02-08 21:05:15 +00:00
Michael 061a6d9239 Use a thousands_separator to improve readability of the federation statistics 2022-02-07 19:21:39 +00:00
Michael cda348def2 Fixed grammar 2022-02-07 06:53:44 +00:00
Michael 8e70e19061 Improved texts 2022-02-07 06:43:37 +00:00
Michael 384fe562a8 More statistics 2022-02-07 06:23:49 +00:00
Michael bdba75ec47 Show detailled statistics per platform 2022-02-07 06:11:37 +00:00
Michael 58b4ecd6ae Show month/halfyear usage 2022-02-07 05:29:00 +00:00
Michael 92a71f8c27 Store wekk/month&halfyear usage / number of posts 2022-02-06 20:03:19 +00:00
Michael 8b585c6ccc Set the timeout to 10 seconds 2022-02-06 10:07:18 +00:00
Michael b3da88ceaa Don't assume AP with Wordpress 2022-02-06 09:21:14 +00:00
Michael 85f029a724 Enforce probing 2022-02-06 09:03:48 +00:00
Michael f1cac5170b mark sites as "phantom" that are up but couldn't be detected 2022-02-06 08:02:19 +00:00
Michael ea2faa28fe Use first word as platform / improvements for registered users 2022-02-06 05:59:47 +00:00
Michael 585af09b7d Only display federated servers 2022-02-06 05:58:37 +00:00
Michael 650f90df25 Platforms: only use and show trusted detections 2022-02-05 22:14:19 +00:00
Hypolite Petovan 121e40357c
Merge pull request #11209 from annando/issue-10365-Events
Issue 10365: Event updates are now processed
2022-02-05 12:08:00 -05:00
Michael 69d7391f90 Added comment 2022-02-05 16:49:21 +00:00
Michael 3e51309525 Check for a filled "event-id" field 2022-02-05 16:22:21 +00:00
Hypolite Petovan 321ad48649
Merge pull request #11210 from annando/detect-pumpio
Detect pump.io servers
2022-02-05 10:20:30 -05:00
Michael Vogel 3a96a97189
Update src/Model/GServer.php
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2022-02-05 16:01:04 +01:00
Michael 4914ee423f Issue 10914: Display events in the feed in the author's timezone 2022-02-05 11:29:50 +00:00
Michael 1564447b8c Detect pump.io servers 2022-02-05 11:25:06 +00:00
Michael bd8032f2ba Issue 10365: Event updates are now processed 2022-02-05 11:16:50 +00:00
Michael 3a6491f994 More system are added to the federation page 2022-02-04 20:45:27 +00:00
Michael 11b6c29a3a Fix for PR #11204 - Forums are now correctly detected 2022-02-04 06:02:21 +00:00
Michael 695d6ce461 Issue 10966: Ignore "only sharer" setting for forum accounts 2022-02-03 20:26:30 +00:00
Hypolite Petovan 4ad528a15c
Merge pull request #11200 from annando/issue-11034
Issue 11034: Use the profile photo for local users
2022-02-02 05:13:03 -05:00
Michael 4808713668 Don't cache local avatars 2022-02-01 20:22:40 +00:00
Michael c7b3c071c7 Issue 11034: Use the profile photo for local users 2022-02-01 19:12:33 +00:00
Hypolite Petovan 237492979c Add rel="tag" to the HTML Purifier allow list in BBCode::convert
- This enables Mastodon to recognize hashtag links and prevent unwarranted link previews
2022-02-01 08:20:45 -05:00
Michael 54d474d0e4 function documentation clarified 2022-01-31 05:47:18 +00:00
Michael 8034a48ffe "inform" functionality moved / unified functionality 2022-01-30 10:56:13 +00:00
Michael b9ea7adbda Issue 10966: Perform forum handling with the unified format 2022-01-30 04:48:22 +00:00
Michael d4f97f8a4b Issue 10966: Improved logging / reworked forum functionality 2022-01-29 19:09:18 +00:00
Michael cd0a0c3424 Issue 11189: Fix notifications for new posts 2022-01-28 05:28:13 +00:00
Michael 9eec2bf5f3 Improved support for "Page" type 2022-01-27 17:51:23 +00:00
Michael c5337c81e7 Improve contact search speed / assume octet-stream on missing content type 2022-01-27 04:05:11 +00:00
Tobias Diekershoff b6aeb6e903
Merge pull request #11180 from annando/announce-notification
Desktop notification for announced posts
2022-01-24 07:24:39 +01:00
Michael f23a264cb4 Fix wrong spelling 2022-01-24 04:58:46 +00:00
Michael 564517607f Notifications for participation added 2022-01-24 04:49:13 +00:00
Michael e4887d23d2 Needless coude duplication removed 2022-01-24 04:15:36 +00:00
Michael 27a306185a Improved notification for announced posts 2022-01-23 21:47:16 +00:00
Philipp 3d8e82d95d
Merge pull request #11141 from urbalazs/language-names
Add native language names to language selector & fix config during install
2022-01-23 20:55:40 +01:00
Hypolite Petovan 53f06b5122
Merge pull request #11179 from nupplaphil/bug/friendica-11178
Fix Addons-Load for StorageManager
2022-01-23 14:53:16 -05:00
Philipp 150e3a6f42
Add DEVELOP flag for StorageManager for testing purpose only 2022-01-23 20:40:38 +01:00
Michael 2b0c2a57a7 Merge remote-tracking branch 'upstream/2021.12-rc' into announce-notification 2022-01-23 19:38:16 +00:00
Michael 8bb2c9fc13 Support for desktop notifications for reshared posts 2022-01-23 19:37:52 +00:00
Philipp 9bcd0ffac8
Fix Addons-Load for StorageManager 2022-01-23 20:23:44 +01:00
Philipp 2c33a7803e
Merge pull request #11150 from annando/user-banner
First support for user header banner image
2022-01-23 20:10:42 +01:00
Philipp 71c7669066
Fix config usage during install process 2022-01-23 20:08:48 +01:00
Philipp 5fcb3e4901
Remove unused field 2022-01-23 20:08:33 +01:00
Philipp b123762459
Move language names to constant 2022-01-23 20:08:12 +01:00
Michael 35e2ae3925 Merge remote-tracking branch 'upstream/2021.12-rc' into lemmy 2022-01-23 10:44:27 +00:00
Michael ad526f5ad2 set the post-type to "poll" for incoming poll posts 2022-01-23 05:50:39 +00:00
Michael a8c6160dd7 Improved handling of several object types 2022-01-23 04:40:45 +00:00
Hypolite Petovan 1a4ec00fec Handle null value for last_used fields in TrustedBrowsers and AppSpecificPassword
- Remove obsolete reference to DBA::NULL_DATETIME
2022-01-22 21:10:20 -05:00
Michael 43b9e39c6a Lemmy support added 2022-01-22 15:24:51 +00:00
Michael dbd6d10536 Issue 8845: Signature support for "created" and "expires" added 2022-01-21 15:38:33 +00:00
Tobias Diekershoff d5665331fe
missing "as" in string
A translator from the SV team discovered a missing "as" in a string.
2022-01-21 14:23:30 +01:00
Michael 7d21f6f8d3 Merge remote-tracking branch 'upstream/2021.12-rc' into user-banner 2022-01-19 18:41:31 +00:00
Michael a46b21590d use "ANY_VALUE" instead of "MAX" 2022-01-18 06:59:02 +00:00
Michael 615c6ca696 Issue 10935: Improved "GROUP BY" handling 2022-01-18 06:35:18 +00:00
Hypolite Petovan babbdf58e6 Fix wrong default value in Module\Api\Friendica\Photo\Create::post
- The underlying Model\Photo::upload doesn't accept a null value for description
2022-01-17 16:46:43 -05:00
Hypolite Petovan aeb112ab5f Fix bidi support in shared posts
- Display was wrong when language direction was different between nickname and content
2022-01-17 07:39:05 -05:00
Michael 0450536621 Merge remote-tracking branch 'upstream/2021.12-rc' into user-banner 2022-01-17 03:04:03 +00:00
Michael 51dcfe134e fixing some more tests 2022-01-16 20:58:58 +00:00
Michael 55679a6021 Possibly fixing one test 2022-01-16 20:54:14 +00:00
Michael 71cf72cc8b Standards 2022-01-16 20:49:59 +00:00
Michael Vogel b38c9bed6f
Apply suggestions from code review
Co-authored-by: Philipp <admin+Github@philipp.info>
2022-01-16 21:47:12 +01:00
Michael dc48f9b8f0 White spaces 2022-01-16 20:17:31 +00:00
Michael 0e15715088 Simplifying extension access 2022-01-16 19:38:59 +00:00
Michael 8e8ec9d2d2 Simplified contact id handling 2022-01-16 18:40:18 +00:00
Michael fd4926b0f3 More parameter handling improved 2022-01-16 18:04:05 +00:00
Michael 6c767743d1 Improved request value handling 2022-01-16 17:30:23 +00:00
Michael dd8d49d9cf Replaced $_REQUEST 2022-01-16 17:03:18 +00:00
Michael 344d514857 Replaced "filter_input" with the new request value function 2022-01-16 16:40:13 +00:00
Michael 720a43461d Fixed max value check, improved request value fetching 2022-01-16 15:22:35 +00:00
Michael a3173ccb50 Define reasonable min and max values 2022-01-16 15:03:01 +00:00
Michael 4724000d06 Unify request value handling 2022-01-16 14:04:20 +00:00
Michael 4319136421 Improved defaults check 2022-01-16 12:38:04 +00:00
Michael 7b68a5956e Improved handling of boolean input values 2022-01-16 09:24:35 +00:00
Michael e6108668e3 Some more cidong style 2022-01-16 09:07:39 +00:00
Michael 7c15d0160a Coding styles / "require_once" for removed file removed 2022-01-16 09:01:04 +00:00
Michael af18e2f2a9 $_POST replaced 2022-01-16 07:41:26 +00:00
Michael f11bf08a7b Use the $request variable 2022-01-16 07:35:20 +00:00
Michael 8ff2cc3976 Superflous spaces 2022-01-16 07:14:09 +00:00
Michael c55c42b303 "DI" calls are replaced 2022-01-16 07:07:46 +00:00
Michael f68c94db04 Some standards 2022-01-15 21:45:08 +00:00
Michael 95f085b7ac API: The legacy API finally moved 2022-01-15 21:38:19 +00:00
Michael 0b4aa019fd Merge remote-tracking branch 'upstream/2021.12-rc' into user-banner 2022-01-15 05:36:06 +00:00
Michael 43779c2c92 Merge remote-tracking branch 'upstream/2021.12-rc' into advanced-cleaned 2022-01-12 21:29:03 +00:00
Michael b065318366 Cleaned advanced contact tab 2022-01-12 21:23:45 +00:00
Hypolite Petovan f2af985350 [frio] Add a conditional browser share button 2022-01-09 12:31:54 -05:00
Hypolite Petovan 18b32b68aa [frio] Add connector-based privacy display 2022-01-09 12:17:52 -05:00
Michael 777919e679 Fix jpeg ending 2022-01-09 16:06:00 +00:00
Michael bb349a7db4 Partially revert changes for the RC 2022-01-09 15:45:14 +00:00
Michael 10bdaa0cfe Always generate a random header if missing 2022-01-09 11:19:31 +00:00
Michael df45a3b915 Remove unneeded code 2022-01-09 10:43:23 +00:00
Michael bbda69a736 Don't store the default header in the contact table 2022-01-09 10:38:36 +00:00
Michael 618903fef7 Only update the contact when the header changed 2022-01-09 05:49:11 +00:00
Michael cfd63f5682 Use randon pictures for networks that don't support banners 2022-01-09 05:24:35 +00:00
Michael 8147073c47 Added license information 2022-01-09 03:29:16 +00:00
Michael d16a648d37 Merge remote-tracking branch 'upstream/2021.12-rc' into user-banner 2022-01-08 23:00:19 +00:00
Michael 77906627c5 Merge remote-tracking branch 'upstream/2021.12-rc' into user-banner 2022-01-08 22:54:18 +00:00
Michael 59358077c7 First support for user headers 2022-01-08 22:43:11 +00:00
Philipp 20934d73b0
Add missing Twitter API routes for IDs 2022-01-08 21:53:19 +01:00
Philipp c588b280d7
Fix all license header & be less aggressive 2022-01-07 00:35:28 +01:00
Philipp 2d326c8a27
Merge pull request #11143 from annando/api-again
API: Functionality moved to new places
2022-01-06 21:19:04 +01:00
Michael 543cc7f51f Moved tests, changes after review 2022-01-06 20:13:32 +00:00
Michael 9414edd64a API: Functionality moved to new places 2022-01-06 07:34:16 +00:00
Hypolite Petovan ff83c170a6
Merge pull request #11140 from nupplaphil/friendica-11138
Fix getBirthdays() method
2022-01-05 10:28:49 +01:00
Balázs Úr b08718fcc3 Add native language names to language selector 2022-01-05 00:33:04 +01:00
Philipp d2229006fc
- Remove redundant code
- Rename some variables
- Add method description
2022-01-04 22:10:36 +01:00
Philipp 7b3515e706
Fix getBirthdays()
- Formatting optimizations
- Remove redundant ASC
2022-01-04 22:10:36 +01:00
Philipp 6eab7d9f14
Fix getBirthdays()
- explicit create an array for the template
2022-01-04 21:59:47 +01:00
Philipp 0e45f22b06
optimizations 2022-01-04 20:59:29 +01:00
Philipp 6dbbd08179
Use rawContent for Special Options to avoid a protected options() method 2022-01-04 20:59:29 +01:00
Philipp 35a2fd45af
Make Response even more compatible .. 2022-01-04 20:59:28 +01:00
Philipp 37f850377e
Fix App routing 2022-01-04 20:59:28 +01:00
Philipp 543e4be0a6
Replace 'REQUEST_METHOD' with App\Arguments::getMethod() 2022-01-04 20:59:28 +01:00
Philipp a3a32af5c1
Add feedback 2022-01-04 20:59:27 +01:00
Philipp dc46af5ea1
Automatically return allowed HTTP methods for OPTIONS per specific endpoint 2022-01-04 20:59:27 +01:00
Philipp 71272e07ee
temporary merge response header into static *exit() methods because of compatibility issues 2022-01-04 20:59:27 +01:00
Philipp 9c8d9e83ac
Fix empty accounts[] bug 2022-01-04 20:59:27 +01:00