Commit Graph

2460 Commits

Author SHA1 Message Date
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 a2a5f05a19 Issue 11310: Show pinned posts when not logged in 2022-03-21 22:58:23 +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 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
Michael 1fe756b5b6 Fixes for the notifications 2022-03-19 09:27:49 +00:00
Hypolite Petovan 04ac4841f9 Add support for notification visibility settings 2022-03-16 22:03:26 -04:00
Hypolite Petovan a07f840c74 Add correct ordering for detailed notifications 2022-03-15 07:05:59 -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 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 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 7ce97459d4 Deprecated the notify table/classes 2022-03-14 07:56:20 -04: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 8c778ca02e Improved completion check for AP 2022-03-12 11:17:33 +00:00
Michael 5a16a424ac Issue 11309: improved check for wanted posts 2022-03-12 07:08:10 +00:00
Hypolite Petovan d15ebb6fd3 Normalize base URL usage in admin templates 2022-03-11 23:14:21 -05: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
Michael 4803b99157 API: Fix "in_reply_to_status_id" 2022-03-08 20:46:26 +00:00
Michael e0468ac914 API: Improve support for the summary field 2022-03-08 18:32: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 bf5c8a2c43 API: several fixes to the Twitter/Statusnet API 2022-02-25 19:16:40 +00: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
Michael d32b9d5d95 Display the BCC receiver when it is the local user 2022-02-24 07:09:34 +00: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
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 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
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
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
Hypolite Petovan 30dcf3380c Show only the user's categories on their profile 2022-02-18 23:58:23 -05: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
Michael 33edfc6a5f Fix for private communities 2022-02-15 23:51:13 +00: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
Michael 29d83c0ffb Block communication with Diaspora for communities 2022-02-15 07:08:02 +00:00
Michael 9c60b4127b Merge remote-tracking branch 'upstream/develop' into private-forums 2022-02-13 07:03:20 +00:00
Michael e394143148 Private forums are now working via ActivityPub 2022-02-12 18:38:36 +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
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 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 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
Michael 3a6491f994 More system are added to the federation page 2022-02-04 20:45:27 +00:00
Michael c7b3c071c7 Issue 11034: Use the profile photo for local users 2022-02-01 19:12:33 +00:00
Michael c5337c81e7 Improve contact search speed / assume octet-stream on missing content type 2022-01-27 04:05:11 +00: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
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 7d21f6f8d3 Merge remote-tracking branch 'upstream/2021.12-rc' into user-banner 2022-01-19 18:41:31 +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
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 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 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
Michael bbda69a736 Don't store the default header in the contact table 2022-01-09 10:38:36 +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
Michael 9414edd64a API: Functionality moved to new places 2022-01-06 07:34:16 +00: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 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 9c8d9e83ac
Fix empty accounts[] bug 2022-01-04 20:59:27 +01:00
Philipp 4e67bfed8d
Use Args::getMethod() at various places 2022-01-04 20:59:26 +01:00
Philipp c7f2ba213b
Fix OPTIONS 2022-01-04 20:59:25 +01:00
Philipp eaad220738
Add explicit status setting for PSR/ResponseInterface & add tests for OPTIONS endpoint 2022-01-04 20:59:25 +01:00
Philipp 01c1e137f7
Add OPTIONS endpoint 2022-01-04 20:59:24 +01:00
Balázs Úr 733f3de9ed Add missing copyright text 2022-01-02 10:49:50 +01:00
Philipp 322b7c856c
Merge pull request #11129 from urbalazs/copyright-2022
Update copyright
2022-01-02 09:45:35 +01:00
Balázs Úr e56a53647b Update copyright 2022-01-02 08:27:47 +01:00
Philipp 0c4c6faa54
Move DirectMessages/Destory tests & fix Destroy condition 2021-12-30 19:58:19 +01:00
Michael f7e859ec2c API: Set "dismissed" instead of "seen" 2021-12-28 20:38:18 +00:00
Hypolite Petovan c371d2ec82
Merge pull request #11105 from annando/api-direct-messages
API: Direct Messages moved to new place
2021-12-28 10:29:00 +01:00
Philipp 5d69f7411d
Add MessageDirect\Search tests 2021-12-27 20:02:37 +01:00
Michael 7488a793a8 Don't count the system user on the administration page 2021-12-24 12:36:44 +00:00
Michael 2ee5745d3c Use dynamic functions 2021-12-19 08:32:19 +00:00
Michael 465ee3718d Use dynamic functions 2021-12-19 08:22:16 +00:00
Michael 94439a3b42 Merge remote-tracking branch 'upstream/2021.12-rc' into api-direct-messages 2021-12-19 07:02:33 +00:00
Michael 1110f4abf7 Fixes space 2021-12-17 15:27:38 +00:00
Michael 47e9aa6338 API: Fix for OAuth endpoints that mustn't be authorized 2021-12-17 15:25:04 +00:00
Michael e9ca41b6f0 Added documentation 2021-12-17 14:55:16 +00:00
Michael ddb2d6f5b3 Merge remote-tracking branch 'upstream/2021.12-rc' into api-direct-messages 2021-12-17 14:52:44 +00:00
Michael 0a3026abce Issue 11101: Fix API authentification 2021-12-17 07:04:52 +00:00
Michael c18bda9397 Standards 2021-12-16 22:54:48 +00:00
Michael fd63421dde Standards 2021-12-16 22:51:47 +00:00
Michael b7a460485a API: Direct Messages moved to new place 2021-12-16 22:44:50 +00:00
Hypolite Petovan 0df24eaf4f
Merge pull request #11088 from nupplaphil/feat/php8_dep
Make Friendica PHP8 compatible & fix 2FA AppSpecificPassword
2021-12-12 21:28:49 -05:00
Hypolite Petovan f212df79e5 Redirect to network page after delegation switch
- Add a notice with the switched account name
2021-12-12 08:15:15 -05:00
Philipp 95fbe45bcc
Bump bacon/bacon-qr-code to 2.0.4 2021-12-11 17:26:39 +01:00
Philipp 245d194f87
Update src/Module/Api/Twitter/Statuses/Destroy.php
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2021-12-10 10:14:30 +01:00
Philipp 631b9a84fc
Reenable Twitter/Retweet tests 2021-12-09 22:45:52 +01:00
Philipp 204b8b6e49
Reenable Twitter/Media Post tests 2021-12-09 22:08:31 +01:00
Philipp f84c696925
Reenable Twitter/Favorites tests 2021-12-09 21:52:40 +01:00
Philipp 2b57266c88
Reenable Twitter/Show test 2021-12-09 21:43:35 +01:00
Philipp e10045f13f
Reenable Twitter/Search test 2021-12-09 21:37:16 +01:00
Philipp 616cf012f9
Reenable Twitter/Lookup tests & add standard assertions 2021-12-09 21:33:02 +01:00
Philipp f9c490b29a
Reenable Twitter/UserTimeline tests 2021-12-09 21:23:58 +01:00
Philipp ccf7e251b5
Reenable Twitter/Statuses tests 2021-12-09 21:17:00 +01:00
Philipp 4d330f2876
Reenable Twitter/Destroy tests 2021-12-09 21:03:33 +01:00
Tobias Diekershoff 1d0955f759
Merge pull request #11060 from urbalazs/typo
Fix typo
2021-12-07 16:04:48 +01:00
Philipp fb1e8e75f5
Add response for JSON only 2021-12-06 00:12:18 +01:00
Philipp dbfe918a8b
Fix tests 2021-12-05 20:34:01 +01:00
Philipp 9081b37762
Fix Twitter statuses list & reenable tests 2021-12-05 20:34:01 +01:00
Philipp 85b9f2b02c
Reenable Incoming test and fixes an array_reverse() bug 2021-12-05 20:34:00 +01:00
Philipp 6d8b8d95b1
Reenable Followers&Friends Lists and fixes a array_reverse() Bug 2021-12-05 20:34:00 +01:00
Philipp 7ca47e8d21
Re enable Blocks/Lists test 2021-12-05 20:34:00 +01:00
Philipp 6b03ee2922
Re enable UpdateProfile test 2021-12-05 20:34:00 +01:00
Philipp cc7b2fae4e
Re-enable AccountVerifyCredentials test 2021-12-05 20:33:59 +01:00
Michael d57cb05a24 Fix: array_reverse returns the reversed content as return value 2021-12-05 06:22:04 +00:00
Hypolite Petovan 80da47921e Replace references to UTC_TIMESTAMP in SQL queries with a DateTimeFormat generated parameter 2021-12-04 17:53:08 -05:00
Hypolite Petovan ecaed2a845 Update DateTimeFormat documentation
- Remove an explicit default value parameter
2021-12-04 17:52:01 -05:00
Michael 799baeda10 Issue 11063: Fix check for current user 2021-12-04 04:30:46 +00:00
Hypolite Petovan e1d6de757f Add expected second parameter to BaseApi::getRequest in a few put() methods 2021-12-03 18:00:54 -05:00
Balázs Úr 48a0049adc
Fix typo 2021-12-03 01:14:29 +01:00
Michael 5e912c2965 Unused use removed 2021-12-02 06:37:06 +00:00
Michael 4a90e6b1f0 Test code removed 2021-12-02 06:36:09 +00:00
Michael bd2ee581d3 Diaspora reshares via API are fixed now 2021-12-02 06:33:19 +00:00
Michael 03d2160690 Removed second ppst parameter 2021-11-30 21:41:10 +00:00
Michael 56f8adcb80 Merge remote-tracking branch 'upstream/2021.12-rc' into api-fixes 2021-11-30 19:07:24 +00:00
Philipp a88cc8d5c8 Replace DI::apiResponse()->exit() with $this->response->exit() 2021-11-30 01:08:00 -05:00
Philipp 2dc60cfd33 Make API call permission checks more reliable
- don't need to inherit every Module method anymore
2021-11-30 01:07:59 -05:00
Philipp 2e4d654c0a Make $_REQUEST processing independent of sub-calls
- Move HTTPInputData::process() into App::runFrontend()
- Pass $_REQUEST (including processed Input) to every Module method
- Delete $_POST parameters at Module post() calls because of $_REQUEST
2021-11-30 01:07:58 -05:00
Philipp f580d8e5c0 extract "BaseApi::checkDefaults()" method for later usage 2021-11-30 01:07:57 -05:00
Michael 7dd757b7f9 Merge remote-tracking branch 'upstream/2021.12-rc' into api-fixes 2021-11-30 05:48:03 +00:00
Michael 56824598ff Standards 2021-11-30 05:20:01 +00:00
Michael Vogel 3ff59cfdc3
Merge pull request #11045 from MrPetovan/bug/11029-contact-group
Use user-specific id to fetch the list of group appartenance in Module\Contact\Profile
2021-11-30 06:17:56 +01:00
Michael 2470482b4e Standards 2021-11-30 05:07:03 +00:00
Michael 33c8872c65 Merge remote-tracking branch 'upstream/2021.12-rc' into api-fixes 2021-11-30 05:00:46 +00:00
Michael e7e74819a3 Fix posting pictures 2021-11-29 18:03:34 +00:00
Hypolite Petovan 2ba3b7f771
Merge pull request #11037 from MrPetovan/bug/11023-api-photo-delete
Fix Api\Friendica\Photo|album\Delete endpoints
2021-11-29 08:44:33 -05:00
Michael 6bd9c9f496 Merge remote-tracking branch 'upstream/2021.12-rc' into api-fixes 2021-11-29 12:52:00 +00:00
Hypolite Petovan cd63533e2c Fix remaining references to BaseModule->parameters 2021-11-29 07:24:32 -05:00
Hypolite Petovan c2df5d66d7 Use user-specific id to fetch the list of group appartenance in Module\Contact\Profile 2021-11-29 07:06:41 -05:00
Hypolite Petovan c7a40906bf Fix Photoalbum delete endpoint
- Fix condition on a removed Item field
2021-11-29 06:29:38 -05:00
Hypolite Petovan e2016bc67d Fix Photo delete endpoint
- Set the request variable type
- Fix the condition on a nonexistant item field
2021-11-29 06:29:38 -05:00
Michael 477b8a91db Added endpoint 2021-11-29 06:09:28 +00:00
Michael 0440765849 Set item permissions on reshare 2021-11-29 04:38:58 +00:00
Michael 71f7679204 Fix function name 2021-11-28 21:40:38 +00:00
Michael cf999e681c Standards 2021-11-28 13:58:26 +00:00
Michael 367479e50e Standards 2021-11-28 13:52:39 +00:00
Michael 19019381e6 Fixes standards 2021-11-28 13:46:30 +00:00
Michael 61f1a4d14d Merge remote-tracking branch 'upstream/2021.12-rc' into api-fixes 2021-11-28 13:44:02 +00:00
Michael 222b35684d API: Added more functions, fixed function names 2021-11-28 13:34:00 +00:00
Philipp d576bb136b
Fix BaseApi and corresponding tests 2021-11-28 13:11:12 +01:00
Michael e381ca6ba0 Added group update 2021-11-27 22:25:40 -05:00
Michael b15d3a2523 API: Next bunch of functions transformed 2021-11-27 22:25:36 -05:00
Hypolite Petovan 9cc675233d Add a second parameter to BaseApi::getRequest to enable API tests 2021-11-27 18:38:09 -05:00
Philipp 056702c1e0
Fixing wrong inherited methodsyntax 2021-11-27 19:58:24 +01:00
Philipp e8ee312d80
Fix Tos Module 2021-11-27 14:11:48 +01:00
Philipp 77b092b4b9
Respect the Dollar(notation :-)) 2021-11-27 13:57:36 +01:00
Philipp 9207b9e408
Fixing https://github.com/friendica/friendica/issues/11033 2021-11-27 13:48:05 +01:00
Philipp f245fdaa5d
Fix Contact modules 2021-11-27 13:19:26 +01:00
Philipp 6a9fff5100
Fixing Response 2021-11-27 12:40:57 +01:00
Philipp ae24bf8d54
Fixing Response 2021-11-27 12:40:57 +01:00
Philipp 7cd85873ee
Replace IRespondToRequests with PSR-7 ResponseInterface 2021-11-27 12:40:57 +01:00
Philipp 78c45bd142
Add NodeInfo Module test as an example 2021-11-27 12:40:56 +01:00
Philipp 537b74f307
Inherit ApiResponse from Response 2021-11-27 12:40:54 +01:00
Philipp 561aba18e3
Introduce Response for Modules to create a testable way for module responses 2021-11-27 12:40:38 +01:00
Philipp 8bdd90066f
Make BaseModule a real entity
- Add all dependencies, necessary to run the content (baseUrl, Arguments)
- Encapsulate all POST/GET/DELETE/PATCH/PUT methods as protected methods inside the BaseModule
- Return Module content ONLY per `BaseModule::run()` (including the Hook logic there as well)
2021-11-27 12:40:36 +01:00
Philipp e852623c4f
Merge pull request #11030 from MrPetovan/bug/11029-add-remove-group
Add backward compatibility with user contacts in Module\Group
2021-11-27 12:37:18 +01:00
Michael a3e3d87a42 Standards 2021-11-26 21:57:18 +00:00
Michael d128b723c0 Code standards 2021-11-26 21:54:25 +00:00
Michael 0de9ae913b API: moved several lists 2021-11-26 21:48:13 +00:00
Hypolite Petovan 8bfe877629 Add backward compatibility with user contacts in Module\Group 2021-11-26 09:48:37 -05:00
Hypolite Petovan a26322b4c2 Replace args call with parameter from router in Module\Group 2021-11-26 09:48:05 -05:00
Michael 0e3c8e3f5e Mixed parameter order 2021-11-26 08:16:06 +00:00
Michael da9b5f32db Unneeded "use" removed 2021-11-26 07:56:54 +00:00
Michael fb47389c69 API: Fix profile_url handling / missing constant 2021-11-26 07:55:02 +00:00
Hypolite Petovan dbcaf51923
Merge pull request #11018 from annando/api-status
API: The status is now an object
2021-11-25 20:27:15 -05:00
Michael 68316c6e85 Coding standards 2021-11-25 11:31:01 +00:00
Michael 1ff6b1cf18 Coding standards 2021-11-25 11:28:56 +00:00
Michael 9c61bd3ffc Lists and tweet search moved 2021-11-25 11:16:47 +00:00
Michael 44555cddb8 More functions moved 2021-11-25 06:00:58 +00:00
Michael 97719ca207 Standards 2021-11-24 23:36:41 +00:00
Michael 6d1d4789f1 Standards ... 2021-11-24 23:35:01 +00:00
Michael 299d70ca1d Standards 2021-11-24 23:31:10 +00:00
Michael 556bcfe78f Some more standards 2021-11-24 23:28:06 +00:00
Michael 260ee13d07 Standards 2021-11-24 23:24:35 +00:00
Michael bd1306d020 Removed whitespace 2021-11-24 23:20:42 +00:00
Michael 242fd646d2 Formatting 2021-11-24 23:06:28 +00:00
Michael c4d52feea5 Many API calls moved 2021-11-24 23:03:34 +00:00
Michael a3aab4a75a Entities, Source and api functions rearranged 2021-11-24 06:44:25 +00:00
Michael Vogel 06284e6007
Merge pull request #11015 from MrPetovan/task/10979-frio-time-tooltip
Move title attribute to <time> tag
2021-11-22 12:45:29 +01:00
Hypolite Petovan 23e1130264 Move title attribute to <time> tag
- Use correct machine-readable value in datetime attribute
2021-11-21 22:51:21 -05:00
Hypolite Petovan 204b077353 Move contact profile GET actions to separate module class 2021-11-21 19:22:41 -05:00
Hypolite Petovan 974b750d6d Move contact profile module to its own class 2021-11-21 19:22:39 -05:00
Hypolite Petovan 197c77f43d Move contact conversation to its own module class 2021-11-21 19:21:58 -05:00
Hypolite Petovan eacfcc69c1 Move contact posts to their own module class
- Remove duplicated check for local_user() in Module\Contact
- [frio] Fix display issue for search items where the More button and icon would show but be inactive
2021-11-21 19:21:39 -05:00
Hypolite Petovan 84e7f65d52 Move sending follow message to remote server to Protocol class 2021-11-21 18:59:36 -05:00
Michael f00792d370 Merge remote-tracking branch 'upstream/develop' into api-rework 2021-11-21 17:02:51 +00:00
Michael a4ef4589e6 Reworked friendship API endpoints 2021-11-21 16:59:09 +00:00
Hypolite Petovan e9b3a9426a
Merge pull request #11012 from annando/api-relations
Fix followers/following for the Mastodon API
2021-11-21 10:14:07 -05:00
Michael 87084a3e85 Fix followers/following for the Mastodon API 2021-11-21 14:47:18 +00:00
Hypolite Petovan 23c56b108b
Merge pull request #11003 from annando/fix-api
Fix legacy API
2021-11-21 07:55:25 -05:00
Michael 0e5f876680 function moved 2021-11-21 09:55:42 +00:00
Michael 2c6afe65a7 Use correct function to fetch the self user 2021-11-21 00:26:35 +00:00
Michael ae99144f57 Tests again 2021-11-21 00:15:36 +00:00
Michael 0f09b4f636 Fixing (some) tests 2021-11-20 23:47:03 +00:00
Michael 647ecd4bd3 Relocate RSS header stuff, cleaning up the code 2021-11-20 13:44:12 +00:00
Michael 4327ccddcb Some more removed functions and parameters 2021-11-20 09:36:17 +00:00
Hypolite Petovan 5a9ef594bf
Merge pull request #10999 from nupplaphil/bug/configcache_set
Fix Installer setup
2021-11-19 17:59:32 -05:00
Michael d576e920d5 Fix legacy API 2021-11-19 20:15:12 +00:00
Philipp 645e4edc63
Revert "Revert "Replace Module::init() with Constructors""
This reverts commit 89d6c89b67.
2021-11-19 20:18:48 +01:00
Hypolite Petovan 89d6c89b67
Revert "Replace Module::init() with Constructors" 2021-11-19 07:23:23 -05:00
Hypolite Petovan 0b6e0566d7
Merge pull request #10987 from annando/api4
API: moved classes / unified user array creation
2021-11-19 06:13:52 -05:00
Philipp 2a22ddcf85
Fix Installer setup
- value "0" can now be saved
2021-11-19 08:48:44 +01:00
Philipp dab9e13c69
Replace $this->l10n->t() with $this->t() for Modules 2021-11-18 23:23:58 +01:00
Michael 8fd738f550 Removed "api_get_user" 2021-11-18 22:20:19 +00:00
Michael 1f79d25ffc Replaced "api_date" 2021-11-18 21:43:13 +00:00
Philipp 04a0cd9301
Add feedback 2021-11-18 21:25:09 +01:00
Philipp 14988ddf19
Replaced DI:: calls at BaseNotifications.phpt 2021-11-18 21:23:43 +01:00
Michael b67c10812a Merge remote-tracking branch 'upstream/develop' into api4 2021-11-18 20:15:57 +00:00
Michael 7c03eba98e Removed unused code 2021-11-18 14:49:12 +00:00
Philipp ce578a7745
Replace Module::init() with Constructors 2021-11-17 22:14:33 +01:00
Hypolite Petovan 190efcefad
Merge pull request #10977 from nupplaphil/feat/dynamic_modules
Introduce interface for `Module`s
2021-11-17 06:36:54 -05:00
Philipp e73eda0156
Add feedback 2021-11-17 08:16:33 +01:00
Michael a9e1847afd Some more comments added 2021-11-17 06:36:12 +00:00
Michael eaf4bc6d4f Added contact 2021-11-17 06:28:39 +00:00
Michael 6ea426178a API: moved classes / unified user array creation 2021-11-16 23:21:40 +00:00
Philipp 766b3f0d01
Fixups 2021-11-16 22:40:39 +01:00
Hypolite Petovan 877b90f7f0
Merge pull request #10986 from annando/issue-10983
Issue 10983: Use the user's settings for the help language
2021-11-16 06:57:33 -05:00
Michael 59787d718d Remove spaces 2021-11-16 07:04:39 +00:00
Michael Vogel ba031e4534
Update src/Module/Help.php
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2021-11-16 07:36:20 +01:00
Michael 84e62b5293 Issue 10983: Use the user's settings for the help language 2021-11-15 22:08:51 +00:00
Philipp cca1be21a3
Fixed static leftovers from #10975 2021-11-14 23:49:07 +01:00
Philipp 5879535822
Switch static::$parameters to $this->parameters 2021-11-14 23:49:07 +01:00
Philipp 489cd0884a
Make BaseModule methods dynamic 2021-11-14 23:49:06 +01:00
Philipp 714f0febc4
Replace $parameters argument per method with static::$parameters 2021-11-14 23:49:05 +01:00
Philipp 2edb631b1f
Fix PHP-CS 2021-11-14 23:21:57 +01:00
Michael 66db55f0cd
Some more API functions moved 2021-11-14 23:21:54 +01:00
Philipp e7f84d4934
Move Api\unsupported tests and remove dependency to System::jsonExit() 2021-11-12 22:44:59 +01:00
Philipp 7797c3a0a8
Migrate API\error tests and fix ApiResponse for RSS/atom 2021-11-12 22:29:58 +01:00
Philipp 2c407a7323
Small improvement 2021-11-12 21:38:38 +01:00
Philipp 6725f05ab2
Moved API\Notification tests 2021-11-12 21:35:21 +01:00
Philipp e477cf215d
Make API testable & move PhotoAlbum tests to new destination 2021-11-12 21:08:36 +01:00
Philipp a0c5c91886
Simplify code 2021-11-12 20:13:04 +01:00
Philipp a9ddd6687b
Replace Logger:: with logger property 2021-11-12 20:08:30 +01:00
Philipp 5bfcc8b91c
Transform ApiResponse::unspported() into dynamic method 2021-11-12 20:07:05 +01:00
Philipp ebf56674f1
Transform ApiResponse::error() into dynamic method 2021-11-12 20:04:47 +01:00
Philipp ea0f41ecf0
Transform ApiResponse::exit() into dynamic method 2021-11-12 20:03:27 +01:00
Philipp 4309f814e0
Transform ApiResponse::formatData() into dynamic method 2021-11-12 19:59:16 +01:00
Philipp f28e64299e
Transform ApiResponse::createXML() into dynamic method 2021-11-12 19:56:37 +01:00
Philipp 319f91301d
Move API Response methods into an own class to make them mockable 2021-11-12 19:52:01 +01:00
Michael Vogel 4587cef677
Update src/Module/Api/Friendica/DirectMessages/Setseen.php
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2021-11-11 18:46:04 +01:00
Michael 293775ab4a Photo delete is moved as well 2021-11-10 23:31:42 +00:00
Michael 02210f285b API: some more converted functions 2021-11-10 23:07:46 +00:00
Michael 17fafd37dd Removed spaces 2021-11-10 07:38:48 +00:00
Michael 1518ad33ad API: Classes moved to the correct places according to their origin 2021-11-10 07:31:39 +00:00
Michael Vogel 58ffded0c8
Update src/Module/BaseApi.php
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2021-11-10 04:44:59 +01:00
Michael 1c84928727 Fix test 2021-11-09 23:04:07 +00:00
Michael bbc4fe851b "init" removed, moved error function 2021-11-09 22:59:58 +00:00
Michael 28a28517e5 Fix code standards 2021-11-09 21:50:56 +00:00
Michael b6943aff36 API call rate_limit_status moved 2021-11-09 21:41:37 +00:00
Michael a6db8df92d Using the "extension" parameter 2021-11-09 19:40:39 +00:00
Michael fb6c3e2912 Simplify the output of api results 2021-11-09 06:42:59 +00:00
Michael a66bb09b40 Moved function to Arrays.php 2021-11-08 22:10:07 +00:00
Michael ac1b8b7b3a Remove space 2021-11-08 21:54:55 +00:00
Michael 3e676f9cf0 Fixed tabs 2021-11-08 21:53:34 +00:00
Michael f5b47fccce API: spme Functionality is transferred to new places 2021-11-08 21:35:41 +00:00
Michael 789361de5f The API is now using the router 2021-11-08 07:23:18 +00:00
Michael cfac13790b "escapeTags" is finally removed 2021-11-07 09:18:25 +00:00
Michael 359dad4244 Some more "escapeTags" removed 2021-11-06 20:25:21 +00:00
Hypolite Petovan 41062eb7e4 Add new purge contacts option to admin server blocklist
- Move adding a server domain pattern to the blocklist in a separate module to allow reviewing the list of known servers that would be affected
2021-11-06 01:36:53 -04:00
Hypolite Petovan 068c567b3d Move server block list HTML escaping to templating 2021-11-06 01:34:16 -04:00
Hypolite Petovan edcfeaf66d
Merge pull request #10956 from annando/escapetags
Some removed escapeTags calls
2021-11-06 00:04:17 -04:00
Michael 23b10cf2ae Some removed escapeTags calls 2021-11-05 19:59:18 +00:00
Philipp 62bacbb833
Remove 'maxloadavg_frontend' restriction in Friendica 2021-11-05 20:52:43 +01:00
Michael 63da4a75e9 The boot.php had been cleared of most functions 2021-11-04 20:29:59 +00:00
Michael 1f7a3fb698 Accept photo fetching for octet-stream as well 2021-11-02 08:10:12 +00:00
Michael 516018861e Merge remote-tracking branch 'upstream/develop' into error-handling 2021-10-31 05:25:39 +00:00
Michael 57353eb9b0 Changed scope 2021-10-31 04:54:24 +00:00
Michael ec5bd9a756 Reverting some parts because wouldn't work 2021-10-30 09:13:06 +00:00
Michael 4236a9a105 Improved http error handling 2021-10-29 23:21:07 +00:00
Philipp 409d909d0f
Restructure HTTPClient for new paradigm 2021-10-28 20:01:03 +02:00
Philipp d778af0b0e
Cleanup namespaces 2021-10-27 20:16:34 +02:00
Philipp 2ab0d06996
Restructure Storage to new paradigm 2021-10-27 20:00:19 +02:00
Philipp b216317477
Refactoring Core class structures ... 2021-10-26 22:11:09 +02:00
Philipp ab83d0dd27
Restructure (P)Config to follow new paradigm 2021-10-26 22:11:06 +02:00
Philipp 68046573a4
Restructure Cache to follow new paradigm 2021-10-26 22:11:06 +02:00
Hypolite Petovan 02e08d5fbc Use router parameters in Diaspora\Receive 2021-10-26 14:56:47 -04:00
Michael 87673fd0c5 Merge remote-tracking branch 'upstream/develop' into logging 2021-10-25 18:56:29 +00:00
Hypolite Petovan c4fdc7466d Test item psid against PermissionSet::PUBLIC constant instead in ActivityPub\Objects
- Address https://github.com/friendica/friendica/issues/10755#issuecomment-950393419
2021-10-24 23:00:40 -04:00
Michael 7fd202dbc9 Handle invalid avatar pictures 2021-10-24 11:33:35 +00:00
Philipp 61839d503a Fix "Suggest a friend" text 2021-10-23 21:45:37 -04:00
Philipp 5d92713a8e Rename Depository to Repository 2021-10-23 21:45:36 -04:00
Philipp 82a6c78033 Move FSuggest to depository 2021-10-23 21:45:35 -04:00
Michael 7ebf211ad2 Fixed indention 2021-10-23 17:23:11 +00:00
Michael 8185c591d8 New option to activate/deactivate contact avatar cache 2021-10-23 17:18:30 +00:00
Michael a497bd3a3d Merge remote-tracking branch 'upstream/develop' into logging 2021-10-22 06:06:39 +00:00
Philipp e0411743e2
Merge pull request #10913 from MrPetovan/bug/10903-profile-edit
Add redirection to clear the owner cache after profile update
2021-10-22 07:12:43 +02:00
Hypolite Petovan cb86048b8a Add redirection to clear the owner cache after profile update 2021-10-21 19:11:28 -04:00
Hypolite Petovan 096dacf0fd Manually expand ACLs coming from non-permissionset tables
- Return early if parameter is empty in ACLFormatter->expand
- Address https://github.com/friendica/friendica/issues/10756#issuecomment-949049195
2021-10-21 18:56:43 -04:00
Michael 17aa00bff8 Fix: Use correct condition to update the avatar 2021-10-21 17:19:41 -04:00
Philipp 1cb76d23ff
Delete the intro after confirming it ;-) 2021-10-21 22:18:32 +02:00
Philipp d67b676ce5
Fix confirm parameter 2021-10-21 21:57:24 +02:00
Philipp bf0782dc6b
Rename setIgnore() to ignore() 2021-10-21 21:49:22 +02:00
Philipp 7d7d310cc4
Replace almost every Introduction places 2021-10-21 21:49:21 +02:00
Philipp a40f503fdd
Move Introduction to new depository paradigm 2021-10-21 21:49:20 +02:00
Michael f6faae5bb1 Replace deprecated log calls 2021-10-20 18:53:52 +00:00
Hypolite Petovan 353cd66b26
Merge pull request #10900 from annando/notify
`enotify.php` is removed and its functions were transferred
2021-10-19 22:22:41 -04:00
Michael 2f1f6f6fb2 Replace "notification" call with new function, removing enotify.php 2021-10-19 19:45:36 +00:00
Michael 3781b34272 PROFILE_PHOTOS is mostly removed and replaced 2021-10-19 19:15:28 +00:00
Philipp 64a336ee8d
Rename method again 2021-10-18 23:32:46 +02:00
Philipp b5d994394e
Fixing PUBLIC usage, Fixing DB-View, Creating tests 2021-10-18 23:32:45 +02:00
Philipp 5fecc9ecf7
Adapt ProfileField & Fix current PermissionSet Usage at ProfileFields 2021-10-18 23:32:44 +02:00
Philipp f273c27e3b
Fixups 2021-10-18 23:32:42 +02:00
Philipp 838cdac5d1
Move ProfileFieldRepository::migrateFromLegacyProfile() & delete old repository 2021-10-18 23:32:41 +02:00
Philipp f403851946
Move ProfileFieldRepository::updateCollectionFromForm() 2021-10-18 23:32:40 +02:00
Philipp 6f692b857b
Move ProfileField::selectByContactId() and ProfileField::selectByUserId() 2021-10-18 23:32:39 +02:00
Philipp a9981c792e
Use ProfileField::selectPublicFieldsByUserId 2021-10-18 23:32:39 +02:00
Philipp 1c0f92c382
Move ProfileField from Model to Entity 2021-10-18 23:32:38 +02:00
Philipp 5d0b7fd87b
Merge pull request #10882 from MrPetovan/task/10865-contact-purge
Add new purge contact content option to admin contact blocklist
2021-10-17 23:44:28 +02:00
Hypolite Petovan aea07a7c15 Add new purge contact content option to admin contact blocklist 2021-10-16 19:29:38 -04:00
Hypolite Petovan ca2c73a2cd Account for the PUBLIC value for id parameter in Depository\PermissionSet::selectOneById 2021-10-16 15:42:21 -04:00
Michael a33185f835 Use a constant for the profile photo album 2021-10-14 04:12:00 +00:00
martincodes aa433f9d87 add condition to count accounts that arent removed 2021-10-13 18:54:22 +02:00
Michael Vogel 09771e1a76
Merge pull request #10870 from MrPetovan/bug/fatal-errors
Use entity property in DB condition in Module\Profile\Status
2021-10-13 07:19:26 +02:00
Hypolite Petovan f622a541c3 Use entity property in DB condition in Module\Profile\Status
- Address https://github.com/friendica/friendica/issues/10756#issuecomment-939538157
2021-10-13 00:09:14 -04:00
Hypolite Petovan b3c576b9ce Fix request parameter mapping to selectByBoundaries() in Api\Mastodon\Notifications 2021-10-12 21:17:19 -04:00
Michael 13827edd2c New photo field "photo-type" as preparation for banners 2021-10-11 14:21:10 +00:00
Michael d3ebb3ac49 Added missing "break" 2021-10-11 05:51:18 +00:00
Michael 41dc6cea2b Replace the legacy function 2021-10-11 04:33:10 +00:00
Michael ee2b249d00 Empty comments removed 2021-10-10 05:38:49 +00:00
Michael 2c134c5229 q is now completely removed 2021-10-09 21:16:15 +00:00
Hypolite Petovan 80a8cd86c4
Merge pull request #10836 from nupplaphil/feat/depository_permissionset
Migrate PermissionSet to Depository paradigm
2021-10-08 09:39:39 -04:00
Michael 3972fe62fe More replaced "q" calls 2021-10-08 04:10:45 +00:00
Philipp f73e4adc44
Add explicit check for PermissionSet and ProfileField 2021-10-07 20:48:39 +02:00
Philipp 62eb16e9ad
Migrate PermissionSet to Depository paradigm 2021-10-07 19:53:38 +02:00
Michael 48f482665c Issue 10841: Redirect always to the same page 2021-10-06 19:02:26 +00:00
Philipp 065b46c721
Split Storage usage and Storage configuration 2021-10-05 20:07:12 +02:00
Michael Vogel 0509e8f37e
Update src/Module/Photo.php
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2021-10-04 21:17:22 +02:00
Michael Vogel 790875d8be
Apply suggestions from code review
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2021-10-04 21:06:13 +02:00
Michael b2c2283817 separate parameter values for different functionalities 2021-10-04 18:04:41 +00:00
Michael 9eba41598d Code review changes 2021-10-04 14:01:46 +00:00
Michael 43a17b6129 Merge remote-tracking branch 'upstream/develop' into photo-guid 2021-10-04 06:21:19 +00:00
Michael d30dc52101 Access contact avatars by guid 2021-10-04 06:13:52 +00:00
Hypolite Petovan 297ff76590 Relax check on id parameter in /photo
- Address https://github.com/friendica/friendica/issues/10756#issuecomment-933020126
- Address https://github.com/friendica/friendica/issues/10755#issuecomment-933020316
2021-10-03 20:59:47 -04:00
Hypolite Petovan a9bb53b021 [frio] Fix event time display 2021-10-03 13:42:32 -04:00
Hypolite Petovan 9935e8e711 Remove event.adjust field
- It was confusing and introduced complexity that wasn't worth the unclear gain
2021-10-03 13:42:32 -04:00
Hypolite Petovan 6db211568a Remove most calls to date_default_timezone_* calls
- It was wrongly used to set the node-wide ot user-specific timezone
- It is now fully managed from the App object
- Add a static variable to DateTimeFormat maintain the convenient local() method
2021-10-03 13:42:31 -04:00
Hypolite Petovan e91ba2b992 Check if the string representation of Notify->link is empty in Module\Notifications\Notification
- The property is a Url object which will always return true when tested for truthy value
2021-10-03 11:34:23 -04:00
Michael Vogel 3d97149007
Merge pull request #10722 from MrPetovan/task/refactor-notifications
Move notify, notifications and introduction notifications to new paradigm
2021-10-03 14:13:28 +02:00
Hypolite Petovan c84d4104e8 Add missing Module\Photo route for post-media id with no customsize 2021-10-03 07:58:52 -04:00
Hypolite Petovan 5112dd06f2 Add missing Module\Photo route for contact avatar 2021-10-03 07:48:46 -04:00
Michael 9961943b73 Code Style: Replace "AS" with "as" 2021-10-03 10:34:41 +00:00
Hypolite Petovan c1ab3801ba Replace remaining reference to Model\Photo::stripExtension 2021-10-03 05:52:53 -04:00
Hypolite Petovan 8cb0bb5deb Switch uid with nickname in user picture URLs
- Keep previous URL scheme fallback as remote contact avatar URLs pointing to local user avatar URLs need to update
2021-10-02 19:06:59 -04:00
Hypolite Petovan 7cdd2d1336 Refactor User::getAvatarUrlForId into getAvatarUrl
- Use user/owner array as parameter instead of uid
- Rename $profile variables to $owner when it's the result of User::getOwnerDataByNick
- Replace Module\Photo::stripExtension with native pathinfo() calls
2021-10-02 19:06:25 -04:00
Hypolite Petovan 8a1a2f658c Create new DI shorthands for notification-related factories 2021-10-02 18:15:45 -04:00