Compare commits

...

1519 Commits

Author SHA1 Message Date
Tobias Diekershoff 7109d2a6a8 Friendica version 2022.10 2022-10-14 20:49:17 +02:00
Tobias Diekershoff 99b09858d2 set the release date for the 2022.10 release in the CHANGELOG 2022-10-14 20:48:08 +02:00
Tobias Diekershoff d989602c1c
Merge pull request #11913 from tobiasd/2022.09-CHANGELOG
Updates for the CHANGELOG for 2022.09
2022-10-14 20:40:31 +02:00
Tobias Diekershoff 1fd9558e60
Merge pull request #11990 from annando/share-feed
Return the pageinfo when feed is shared
2022-10-14 08:01:09 +02:00
Michael c2e57c5c0e Return the pageinfo when feed is shared 2022-10-14 04:43:46 +00:00
Tobias Diekershoff 8936ae26fd added fix for quoted shares from Twitter to the CHANGELOG 2022-10-13 09:53:58 +02:00
Philipp 1cc3fa6d77
Merge pull request #11989 from annando/quote-again
Only add images for non-federated quote shares
2022-10-12 08:27:17 +02:00
Michael da2afbeae3 Merge remote-tracking branch 'upstream/2022.09-rc' into quote-again 2022-10-12 05:36:00 +00:00
Michael e69b04d2df Only add the media for non federated posts 2022-10-12 05:34:55 +00:00
Michael Vogel b1364a2327
Merge pull request #11988 from MrPetovan/bug/notices
Add missing post keys to retrieve pLink in Model\Event::prepareListForTemplate()
2022-10-12 07:26:15 +02:00
Hypolite Petovan 0480d9aebd Add missing post keys to retrieve pLink in Model\Event::prepareListForTemplate()
- Address https://github.com/friendica/friendica/issues/11632#issuecomment-1275117722
2022-10-11 22:18:52 -04:00
Hypolite Petovan ec9059c395
Merge pull request #11987 from annando/quoted-media
Fix attached media in quoted posts
2022-10-11 19:54:44 -04:00
Michael 0e82f64d71 Only attach images 2022-10-11 21:39:28 +00:00
Michael f1f13db24f Simplified code 2022-10-11 20:48:47 +00:00
Michael 68d6e11d83 Fix attached media in quoted posts 2022-10-11 20:10:39 +00:00
Philipp 04564f0320
Merge pull request #11983 from MrPetovan/bug/fatal-errors
Contact array can be empty in Model\Contact::getAvatarPath
2022-10-11 17:52:17 +02:00
Hypolite Petovan 9e74a1bd06 Contact array can be empty in Model\Contact::getAvatarPath
- Address https://github.com/friendica/friendica/issues/11630#issuecomment-1274195844
2022-10-11 08:26:00 -04:00
Hypolite Petovan ec1da90094
Merge pull request #11982 from annando/fix-quote
Quoted posts from Twitter now contain media again
2022-10-10 21:53:19 -04:00
Michael 747139d186 Quoted posts from Twitter now contain media again 2022-10-10 23:18:58 +00:00
Hypolite Petovan 0b0567081a
Merge pull request #11981 from annando/better-quote
Quote of quotes are visually improved
2022-10-10 09:46:47 -04:00
Michael 028de0e228 Quote of quotes are visually improved 2022-10-10 12:30:07 +00:00
Tobias Diekershoff c8406f6cd0
Merge pull request #11980 from annando/cooldown
Use "maxloadavg" when "worker_load_cooldown" is not defined
2022-10-10 12:17:45 +02:00
Michael a21c04d55d Use "maxloadavg" when "worker_load_cooldown" is not defined 2022-10-10 06:01:07 +00:00
Tobias Diekershoff 7e8c48a539 added new API endpoint for events to the CHANGELOG 2022-10-10 07:57:12 +02:00
Tobias Diekershoff 656e74605f typo 2022-10-10 07:36:43 +02:00
Hypolite Petovan a10f55bb85
Merge pull request #11979 from annando/issue-11853
Notices
2022-10-09 17:45:33 -04:00
Hypolite Petovan 424dad886f
Merge pull request #11978 from annando/quote-simplified
The quote functionality is simplified
2022-10-09 17:26:22 -04:00
Michael 0d3aa681b4 The quote functionality is simplified 2022-10-09 21:16:36 +00:00
Michael Vogel 2b03edd59e
Merge pull request #11977 from MrPetovan/bug/11938-exotic-date-time-formats
Add a couple new cases to DateTimeFormat::fix()
2022-10-09 17:16:01 +02:00
Tobias Diekershoff b56a9cf419 some updates for the CHANGELOG 2022-10-09 16:01:02 +02:00
Hypolite Petovan a4b0ebf160 Add a couple of cases to DateTimeFormat::fix()
- Reworked method to perform more string replacements and fewer regular expression matches
2022-10-09 09:34:38 -04:00
Hypolite Petovan bee6506d33 Only call DateTimeFormat::fix() when there's an Exception
- This prevents valid date/time strings to be mangled by fix()
2022-10-09 09:34:30 -04:00
Michael Vogel b5ad8c3e15
Merge pull request #11973 from MrPetovan/task/test-fixDateFormat
Add tests for DateTimeFormat::fix()
2022-10-08 17:11:10 +02:00
Hypolite Petovan a36ea64bb4
Merge pull request #11976 from annando/issue-11975
Issue 11975: Don't call the postupdate if the table is missing
2022-10-08 10:48:57 -04:00
Michael 4552d36373 Issue 11975: Don't call the postupdate if the table is missing 2022-10-08 14:42:11 +00:00
Hypolite Petovan 47dd19ab95
Merge pull request #11974 from annando/issue-11969
Issue 11969: Simplified share
2022-10-08 10:04:07 -04:00
Michael 4a37c978c2 Issue 11969: Simplified share 2022-10-08 09:36:35 +00:00
Hypolite Petovan 345d307ae0 Add tests for DateTimeFormat::fix() 2022-10-07 23:10:50 -04:00
Hypolite Petovan c0447ced48 Simplify method name for DateTimeFormat::fix 2022-10-07 23:10:50 -04:00
Hypolite Petovan 9d2edcf0e1
Merge pull request #11972 from annando/issue-11969
Issue 11969: Only use the simple share with federated posts
2022-10-07 17:35:26 -04:00
Michael Vogel 49c5d62530
Merge pull request #11970 from MrPetovan/bug/marcor-newapi
Fix parameter names before being passed to Model\Event::store
2022-10-07 23:32:21 +02:00
Hypolite Petovan 2cbc11403e Fix parameter names before being passed to Model\Event::store
- Partial revert of 946db2ab45
2022-10-07 17:20:22 -04:00
Michael b92e23273d Only use http links 2022-10-07 21:17:39 +00:00
Michael d646d4eb1d Issue 11969: Only use the simple share with federated posts 2022-10-07 21:09:15 +00:00
Hypolite Petovan 616c4695f4
Merge pull request #11971 from annando/dateformat
And another weird date format
2022-10-07 17:04:12 -04:00
Michael 1ddeaaad4a And another weird date format 2022-10-07 19:56:02 +00:00
Hypolite Petovan 885f90afa3
Merge pull request #11967 from annando/quote-share
Improve quote share ("message_id" added)
2022-10-07 08:00:31 -04:00
Michael 33d48f7d55 Use trim 2022-10-07 08:14:04 +00:00
Michael ee03e4de08 Fix test 2022-10-07 08:13:26 +00:00
Michael a07fd7d7c2 Spaces to tabs 2022-10-07 08:07:12 +00:00
Michael f340fc6efa Harmonized regular expression 2022-10-07 08:00:09 +00:00
Michael 21bd2a8396 More whitespace 2022-10-07 07:57:20 +00:00
Michael f8d4ab1830 Whitespace removed 2022-10-07 07:55:44 +00:00
Michael ef934db614 Moved the share interpretation 2022-10-07 07:41:03 +00:00
Michael 1ef5730d3d "share" added to autocomplete 2022-10-07 05:54:17 +00:00
Michael d7a9745ffd Simplified share element 2022-10-07 05:51:36 +00:00
Tobias Diekershoff 71cc10835f
Merge pull request #11968 from MrPetovan/bug/11943-frio-left-sidebar-button-mobile
[frio] Add left sidebar toggle button for mobile anonymous view
2022-10-07 07:40:25 +02:00
Michael 8e9acfe210 Fix tests? 2022-10-07 05:22:10 +00:00
Hypolite Petovan 1422e8a510 [frio] Add left sidebar toggle button for mobile anonymous view
- It was missing from the anonymous top bar
2022-10-06 18:00:43 -04:00
Michael 48182a95fb Improve quote share ("message_id" added) 2022-10-06 21:50:20 +00:00
Hypolite Petovan fe442683ef
Merge pull request #11966 from annando/date-correction
Juts another date format fix
2022-10-06 17:39:44 -04:00
Michael 6b917718fd Juts another date format fix 2022-10-06 21:09:52 +00:00
Tobias Diekershoff b0d0d98a14
Merge pull request #11965 from annando/akkoma
Akkoma is added to the federation statistics
2022-10-06 08:33:59 +02:00
Michael 4c8a58c445 Akkoma is added to the federation statistics 2022-10-06 04:57:43 +00:00
Hypolite Petovan e840166d7d
Merge pull request #11964 from annando/dfrn-issharing
Added sharing check for DFRN
2022-10-05 18:28:09 -04:00
Michael f9b7f3acdb Added sharing check for DFRN 2022-10-05 21:11:09 +00:00
Hypolite Petovan b84f2b471a
Merge pull request #11961 from tobiasd/2022.09-credits
regen CREDITS for the next release
2022-10-04 11:37:12 -04:00
Tobias Diekershoff 964d54ee45 regen CREDITS for the next release 2022-10-04 17:28:08 +02:00
Hypolite Petovan fa3f5d8d9c
Merge pull request #11960 from annando/issue-11880
Issue 11880: Provide "alt" description from uploaded file
2022-10-03 19:10:00 -04:00
Michael 4d39ec8b63 Issue 11880: Provide "alt" description from uploaded file 2022-10-03 21:23:04 +00:00
Philipp e1bf708552
Merge pull request #11959 from annando/notice
Fix: Undefined array key "object_object_type"
2022-10-03 22:21:18 +02:00
Michael bde7283b04 Fix: Undefined array key "object_object_type" 2022-10-03 20:01:28 +00:00
Hypolite Petovan 241bd47896
Merge pull request #11958 from annando/issue-11938
Issue 11938: Fix weird date formats
2022-10-03 13:47:27 -04:00
Michael Vogel 0a7c9c66b5
Update src/Util/DateTimeFormat.php
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2022-10-03 19:04:49 +02:00
Michael 045238070b Issue 11938: Fix weird date formats 2022-10-03 16:12:22 +00:00
Hypolite Petovan 168827c8ae
Merge pull request #11957 from annando/issue-11891
Issue 11891: Enable search for user@domain.tld
2022-10-03 11:15:55 -04:00
Michael 4b8c631216 Issue 11891: Enable search for user@domain.tld 2022-10-03 13:53:19 +00:00
Hypolite Petovan 3895da3618
Merge pull request #11956 from annando/issue-11952
Issue 11952: Avoid to send AP related comments to Diaspora
2022-10-03 09:20:37 -04:00
Michael 8347f0144b Fix log message 2022-10-03 11:42:50 +00:00
Michael 5127784acb Recursively check if the thread supports Diaspora 2022-10-03 11:04:57 +00:00
Michael 7395ae22f7 Issue 11952: Avoid to send AP related comments to Diaspora 2022-10-03 10:40:16 +00:00
Hypolite Petovan 38cf0666bd
Merge pull request #11955 from annando/issue-11953
Fix picture link removal in "getAttachedData"
2022-10-02 21:35:30 -04:00
Michael 1afbcb2486 Added description 2022-10-02 23:55:33 +00:00
Michael bf4c5ba84f Improved URL handling 2022-10-02 20:42:21 +00:00
Hypolite Petovan 844ed720b2
Merge pull request #11948 from annando/transmit-quote
Support for transmitting quoted posts
2022-10-02 12:14:19 -04:00
Michael 0de458e134 Case changed 2022-10-02 04:51:00 +00:00
Michael 1612715626 Merge remote-tracking branch 'upstream/2022.09-rc' into issue-11953 2022-10-01 23:02:55 +00:00
Michael 6fb5e13b08 Add ♲ symbol 2022-10-01 22:36:02 +00:00
Michael 8d9cb974af Merge remote-tracking branch 'upstream/2022.09-rc' into transmit-quote 2022-10-01 22:30:44 +00:00
Michael 54d25ebc91 Fix picture link removal in "getAttachedData" 2022-10-01 22:26:37 +00:00
Hypolite Petovan 034f0ec1e4
Merge pull request #11954 from annando/issue-11953
Issue 11953: Split a message in parts
2022-10-01 15:49:21 -04:00
Michael 1e29c6f705 Ensure not to add the plink 2022-10-01 16:54:11 +00:00
Michael 2d6735a616 Issue 11953: Split a message in parts 2022-10-01 16:37:32 +00:00
Michael 8eb4ab2a33 Added comment for the deactivated part 2022-09-30 07:17:07 +00:00
Michael d43b85e94b Don't transmit the shared attachments 2022-09-30 07:10:43 +00:00
Michael 59004711ec Support for transmitting quoted posts 2022-09-29 22:29:15 +00:00
Hypolite Petovan 1edcd65e0e
Merge pull request #11947 from annando/ap-quote
Support for quoted links is added
2022-09-29 12:20:46 -04:00
Michael a653c6350d Support for quoted links is added 2022-09-29 16:04:33 +00:00
Hypolite Petovan c0e009ac6f
Merge pull request #11946 from annando/non-follower-content
Additional checks for non follower content
2022-09-29 11:34:43 -04:00
Hypolite Petovan 39bc4a5881
Merge pull request #11945 from tobiasd/20220929-fr
FR translation update THX Nicolas Derive
2022-09-29 11:21:59 -04:00
Michael 9587787089 Add uri as well 2022-09-29 14:13:39 +00:00
Michael 6140f850e1 Detect the thread parent id if it is missing 2022-09-29 13:48:10 +00:00
Michael ff80a25966 Additional checks for non follower content 2022-09-29 12:45:47 +00:00
Tobias Diekershoff 560f061380 FR translation update THX Nicolas Derive 2022-09-29 14:26:01 +02:00
Hypolite Petovan 89cc704b8a
Merge pull request #11944 from annando/follow-object
Added logging of unexpected follow messages
2022-09-28 14:35:56 -04:00
Michael b10496f4e9 Changed log level 2022-09-28 16:45:18 +00:00
Michael d821afb418 Added logging of unexpected follow messages 2022-09-28 16:32:17 +00:00
Hypolite Petovan fa71ec462b
Merge pull request #11942 from annando/contact-posts
Only display reshared thread starting posts
2022-09-28 05:55:10 -04:00
Michael c65f78e579 Only display reshared thread starting posts 2022-09-28 09:48:48 +00:00
Hypolite Petovan c12ac42695
Merge pull request #11940 from annando/issue-11876
Issue 11876: Fix local message distribution
2022-09-27 12:07:30 -04:00
Michael 2def5e9f02 Issue 11876: Fix local message distribution 2022-09-27 15:58:16 +00:00
Hypolite Petovan 38096ce4cb
Merge pull request #11939 from nupplaphil/bug/l10n
Minor l10n issue
2022-09-27 11:20:37 -04:00
Philipp 0ce7b49cb3
Minor l10n issue 2022-09-27 10:52:17 +02:00
Hypolite Petovan 57a98c45f1
Merge pull request #11921 from annando/worker-timeout
We can now configure the worker runtime limits
2022-09-26 10:51:46 -04:00
Michael 4c52772d84 Use class constant 2022-09-26 13:33:31 +00:00
Michael 5e51ab95fb Merge remote-tracking branch 'upstream/2022.09-rc' into worker-timeout 2022-09-26 13:26:56 +00:00
Hypolite Petovan afac91fa34
Merge pull request #11936 from annando/youtube-shorts
Added support for the "Youtube Shorts" URL
2022-09-26 07:33:23 -04:00
Hypolite Petovan e56e543a79
Merge pull request #11933 from nupplaphil/bug/module_returns
Fix /api/v1/push/subscription
2022-09-26 07:32:24 -04:00
Philipp d80646ccc7
Merge pull request #11935 from annando/issue-11932
Issue 11932: Restore SQL performance
2022-09-26 13:23:54 +02:00
Michael 297ddbb8c8 Added support for the "Youtube Shorts" URL 2022-09-26 07:04:35 +00:00
Michael 63ec808fb9 Issue 11932: Restore SQL performance 2022-09-26 06:39:28 +00:00
Philipp 883a2ee71b
Update src/Module/Api/Mastodon/PushSubscription.php
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2022-09-26 07:25:04 +02:00
Philipp 5c88813775
Update src/Module/Api/Mastodon/PushSubscription.php
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2022-09-26 07:24:55 +02:00
Philipp 2d4598a4db
adapt return type 2022-09-25 23:17:37 +02:00
Philipp 60b1cac166
Add empty testcase for later .. would work if we could mock applications 2022-09-25 21:39:29 +02:00
Philipp 006dbcf4ce
some code-beautification 2022-09-25 21:39:29 +02:00
Philipp ad62265d08
Fix /api/v1/push/subscription 2022-09-25 21:39:28 +02:00
Hypolite Petovan e83dfab6cd
Merge pull request #11929 from annando/issue-11919
Issue 11919: Avoid possible memory problems
2022-09-25 08:48:56 -04:00
Michael 22ed028ba1 Simplified structure 2022-09-25 07:12:05 +00:00
Michael e584185c0a Updated messages.po 2022-09-25 07:09:22 +00:00
Michael 662c846402 Issue 11919: Avoid possible memory problems 2022-09-25 06:34:13 +00:00
Michael Vogel 81f7feabc6
Merge pull request #11928 from MrPetovan/bug/11851-content-0
Fix removing falsy text nodes in HTML::tagToBBCodeSub
2022-09-25 07:28:54 +02:00
Hypolite Petovan 3e1b6890b7 Fix removing falsy text nodes in HTML::tagToBBCodeSub
- This wrongly removed text nodes containing just '0'
2022-09-24 22:03:49 -04:00
Hypolite Petovan df559a24c0
Merge pull request #11927 from annando/missing-uri-id
Add the uri-id if missing
2022-09-24 18:33:23 -04:00
Michael bca9069b22 Add the uri-id if missing 2022-09-24 21:53:27 +00:00
Michael Vogel 08ead52433
Merge pull request #11763 from tobiasd/marcor-newapi
new event APIs
2022-09-24 21:18:20 +02:00
Hypolite Petovan 5a236e0af2
Merge pull request #11925 from mexon/mat/dont-remove-slash
Do not remove trailing slash from URIs
2022-09-24 15:05:02 -04:00
Hypolite Petovan 02e9a867ae
Merge pull request #11926 from annando/sql-queries
(Hopefully) SQL improvements
2022-09-24 15:01:34 -04:00
Hypolite Petovan 080aa55302
Merge pull request #11924 from annando/error
Fix error "Class 'Friendica\Worker\Worker' not found"
2022-09-24 14:59:58 -04:00
Michael Vogel b00947025a
Merge pull request #11922 from MrPetovan/bug/notices
Ward against missing keys in Model\APContact::isRelay
2022-09-24 20:02:21 +02:00
Michael Vogel 260310e878
Merge pull request #11923 from MrPetovan/bug/fatal-errors
Check for network key existence before calling Probe::isProbable in Model\Contact
2022-09-24 20:01:17 +02:00
Michael 3911c9450b (Hopefully) SQL improvements 2022-09-24 17:56:07 +00:00
Michael bd817d2391 Fix error "Class 'Friendica\Worker\Worker' not found" 2022-09-24 17:29:00 +00:00
Matthew Exon 7613433357 Do not remove trailing slash from URIs 2022-09-24 17:57:28 +02:00
Hypolite Petovan 6ca725e5b6 Check for network key existence before calling Probe::isProbable in Model\Contact
- Address https://github.com/friendica/friendica/issues/11630#issuecomment-1253225607
2022-09-24 10:18:41 -04:00
Hypolite Petovan ded5a0ac6a Ward against missing keys in Model\APContact::isRelay
- Address https://github.com/friendica/friendica/issues/11632#issuecomment-1231904280
2022-09-24 09:56:12 -04:00
Michael Vogel 98a4c7a56c We can now configure the worker runtime limits 2022-09-24 10:00:41 +02:00
Hypolite Petovan be9bbe1709
Merge pull request #11917 from annando/cooldown
More cooldown calls for worker processes
2022-09-22 22:39:04 -04:00
Michael 97e5477bde static cooldown moved to the cooldown function 2022-09-22 22:46:59 +00:00
Hypolite Petovan 264b8f27fd
Merge pull request #11918 from annando/fcontact
Worker for updating fcontact entries
2022-09-22 11:00:15 -04:00
Michael e1341b6ad3 Fallback for load detection, additional checks 2022-09-22 05:45:42 +00:00
Michael 30eb511da3 Reverting changes 2022-09-22 04:33:00 +00:00
Michael 4939be065e Merge remote-tracking branch 'upstream/2022.09-rc' into cooldown 2022-09-22 04:31:50 +00:00
Hypolite Petovan 6a9d91c824
Merge pull request #11902 from annando/duplicates
Detect and remove contact duplicates
2022-09-21 21:23:37 -04:00
Michael Vogel c87150819b Worker for updating fcontact entries 2022-09-21 22:47:09 +02:00
Michael Vogel f7d054674d Don't perform a cooldown in the daemon by now 2022-09-21 22:44:48 +02:00
Michael Vogel 0fa281247d More cooldown calls for worker processes 2022-09-21 21:03:07 +02:00
Tobias Diekershoff 3f3e1a2bf4
Merge pull request #11914 from annando/forum-delivery
Fix forum delivery in case of being addressed via "@"
2022-09-21 11:07:00 +02:00
Michael Vogel 6ee8a966bf Fix forum delivery in case of beiong addressed via "@" 2022-09-21 10:54:05 +02:00
Tobias Diekershoff 94cd729cca Updates for the CHANGELOG for 2022.09 2022-09-21 09:46:24 +02:00
Michael 36668dfdb1 Merge remote-tracking branch 'upstream/2022.09-rc' into duplicates 2022-09-21 03:46:25 +00:00
Hypolite Petovan 4deee0932c
Merge pull request #11910 from annando/logging
Improved page rendering speed logging
2022-09-20 21:05:58 -04:00
Hypolite Petovan ddfc0f2cd9
Merge pull request #11908 from annando/relay-languages
Allow to reject specific languages on receiving posts via the relay
2022-09-20 21:04:58 -04:00
Michael Vogel 7ae500f28d Improved page rendering speed logging 2022-09-20 16:30:56 +02:00
Michael Vogel d55a5cd17b Changed documentation 2022-09-20 06:09:17 +02:00
Michael Vogel 199d8bbf35 Merge remote-tracking branch 'upstream/2022.09-rc' into relay-languages 2022-09-20 06:05:15 +02:00
Hypolite Petovan 0747eb4961
Merge pull request #11905 from annando/fcontact-noscrape
The fcontact table is now updated in the background to improve performance
2022-09-19 09:10:32 -04:00
Michael Vogel 6ba2c4bb01 Added documentation 2022-09-19 12:49:37 +02:00
Michael Vogel 3650feb256 "Count" parameter added 2022-09-19 12:46:28 +02:00
Michael Vogel f08b08e0d8 Allow to reject specific languages on receiving posts via the relay 2022-09-19 12:36:12 +02:00
Michael Vogel 2525b3f2ae
Update src/Network/Probe.php
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2022-09-19 07:52:40 +02:00
Michael Vogel e5c24f33f0 The fcontact table is now updated in the background to improve performance 2022-09-18 15:40:44 +02:00
Philipp 3ec9d51ec8
Merge pull request #11904 from MrPetovan/task/composer
[Composer] Update dependencies ahead of 2022.09 release
2022-09-18 11:26:06 +02:00
Hypolite Petovan 3043ef4192 [Composer] Update dependencies ahead of 2022.09 release
- Updating bacon/bacon-qr-code (2.0.4 => 2.0.7)
- Updating ezyang/htmlpurifier (v4.13.0 => v4.14.0)
- Updating guzzlehttp/psr7 (1.8.3 => 1.9.0)
- Updating guzzlehttp/promises (1.5.1 => 1.5.2)
- Updating symfony/polyfill-php72 (v1.23.0 => v1.26.0)
- Updating symfony/polyfill-intl-normalizer (v1.23.0 => v1.26.0)
- Updating symfony/polyfill-intl-idn (v1.23.0 => v1.26.0)
- Updating guzzlehttp/guzzle (6.5.5 => 6.5.8)
- Updating mobiledetect/mobiledetectlib (2.8.37 => 2.8.39)
- Updating monolog/monolog (1.26.1 => 1.27.1)
- Updating phpseclib/phpseclib (2.0.35 => 2.0.38)
- Updating smarty/smarty (v4.1.0 => v4.2.1)
- Updating bower-asset/vue (v2.6.14 => v2.7.10)
- Updating npm-asset/moment (2.29.1 => 2.29.4)
- Updating paragonie/constant_time_encoding (v2.4.0 => v2.6.3)
- Updating paragonie/sodium_compat (v1.17.0 => v1.18.0)
- Updating fgrosse/phpasn1 (v2.3.0 => v2.4.0)
- Updating composer/ca-bundle (1.3.1 => 1.3.3)
2022-09-17 23:38:11 -04:00
Michael 79b64cc44f Detect and remove contact duplicates 2022-09-16 05:00:06 +00:00
Hypolite Petovan 636325efcc
Merge pull request #11899 from annando/native-xml
Template based XML generation is replaced with native XML
2022-09-11 04:39:39 -04:00
Philipp 7c64ab890a
Merge pull request #11888 from MrPetovan/bug/11861-frio-filerm
[frio] Add support for asynchronous call to /filerm module for post categories and folders
2022-09-11 10:35:34 +02:00
Hypolite Petovan 6db79aa741 Updated main translation file after moving strings 2022-09-11 03:35:14 -04:00
Michael ff89c1a8bf Template based XML generation is replaced with native XML 2022-09-11 07:00:16 +00:00
Hypolite Petovan 60d1779717 [frio] Add support for asynchronous call to /filerm module for post categories and folders
- This prevents the page to change to an empty page when clicking on the remove link of categories and folders
2022-09-11 02:36:06 -04:00
Hypolite Petovan cacfc6ec92 Enable POST route for /filerm module
- This prevents a costly page empty page render when calling the module asynchronously
2022-09-11 02:36:06 -04:00
Hypolite Petovan bdd80eeaaf Fix wrong parameter name in Core\System::httpExit 2022-09-11 02:36:05 -04:00
Philipp 77798482cb
Merge pull request #11898 from tobiasd/20220911-hu
HU translation updates THX Balázs Úr
2022-09-11 08:31:29 +02:00
Tobias Diekershoff 9d6e4d7483 HU translation updates THX Balázs Úr 2022-09-11 08:19:20 +02:00
Philipp 2123b4d071
Merge pull request #11895 from annando/smarty-sub-dir
Smarty: Configuration added to store without sub directories
2022-09-09 08:20:04 +02:00
Michael 63e1ad7dba Read the config at another place 2022-09-08 06:21:16 +00:00
Michael ff677a1b27 Smarty: Configuration added to store without sub directories 2022-09-08 05:10:26 +00:00
Hypolite Petovan 7da43fe28a
Merge pull request #11892 from annando/pagecache
Pagecache for frequently fetched pages
2022-09-07 22:25:19 -04:00
Michael 8b41783aaa Changed database version 2022-09-07 19:47:59 +00:00
Michael a0b99f61ea Use the cached activity function 2022-09-07 19:46:24 +00:00
Hypolite Petovan f762a38dbb
Merge pull request #11894 from annando/issue-11893-a
Issue 11893: Postupdate to fix wrong parents
2022-09-06 19:40:37 -04:00
Michael 0121c2845a Test stuff removed 2022-09-06 22:56:56 +00:00
Michael da658cbf1d Delete the cache entry when the post is changed or deleted 2022-09-06 21:51:47 +00:00
Michael d7212cbbbc Function only needn't to be public 2022-09-06 20:47:18 +00:00
Michael ec8377a8c7 Issue 11893: Postupdate to fix wrong parents 2022-09-06 20:00:06 +00:00
Michael 7c9f10e58f Merge remote-tracking branch 'upstream/2022.09-rc' into pagecache 2022-09-06 17:36:42 +00:00
Philipp f0622163b2
Merge pull request #11893 from annando/issue-11890
Issue 11890: Don't use empty contexts
2022-09-06 18:24:36 +02:00
Michael 2a4c6d44bb Don't transmit empty conversations 2022-09-06 15:18:41 +00:00
Michael f0d151932e Issue 11890: Don't use empty contexts 2022-09-06 14:08:25 +00:00
Michael 6eb9dff807 Pagecache for frequently fetched pages 2022-09-06 06:04:41 +00:00
Hypolite Petovan 934a3a6721
Merge pull request #11887 from annando/maxload
Pause the worker execution when the load is too high
2022-09-04 15:54:40 -04:00
Hypolite Petovan 8f283985f0
Merge pull request #11884 from annando/language
Improved language detection
2022-09-04 15:52:29 -04:00
Hypolite Petovan acaa15b6fb
Merge pull request #11886 from annando/database
All URL fields are now binary and longer
2022-09-04 15:48:41 -04:00
Michael e2cb705468 Merge remote-tracking branch 'upstream/2022.09-rc' into language 2022-09-04 17:04:13 +00:00
Michael 437c230a6f Merge remote-tracking branch 'upstream/2022.09-rc' into database 2022-09-04 17:03:14 +00:00
Michael 96ae2c8f56 Merge remote-tracking branch 'upstream/2022.09-rc' into maxload 2022-09-04 17:01:35 +00:00
Philipp 2ad587faf4
Merge pull request #11883 from annando/performance
Use AP data when possible
2022-09-04 18:22:07 +02:00
Michael f5d6671fbd Merge remote-tracking branch 'upstream/2022.09-rc' into performance 2022-09-04 14:08:16 +00:00
Michael 12d4bae28f Merge remote-tracking branch 'upstream/2022.09-rc' into language 2022-09-04 14:05:46 +00:00
Michael 075638c0ae Pause the worker execution when the load is too high 2022-09-04 13:54:32 +00:00
Michael f93418b295 Merge remote-tracking branch 'upstream/2022.09-rc' into database 2022-09-04 13:41:21 +00:00
Tobias Diekershoff da655f5159
Merge pull request #11885 from annando/tolerant-receiver
Be more tolerant when receiving messages
2022-09-04 15:11:43 +02:00
Michael c3d478aeed Improved logger calls 2022-09-04 09:22:15 +00:00
Michael 7c756a3bcb Updated database.sql and messages.po 2022-09-04 08:08:50 +00:00
Michael 767883476f Updated database.sql and messages.po 2022-09-04 08:06:32 +00:00
Michael b0326afae3 Updated database.sql and messages.po 2022-09-04 08:03:56 +00:00
Michael 144547009b All URL fields are now binary and longer 2022-09-04 07:54:01 +00:00
Michael de2d486e95 Merge remote-tracking branch 'upstream/2022.09-rc' into performance 2022-09-04 07:45:24 +00:00
Michael f22a4ba6f5 Be more tolerant when receiving messages 2022-09-04 07:39:09 +00:00
Michael 4304aa9eec Improved language detection 2022-09-04 07:32:46 +00:00
Michael 9f2d3e6f88 Use AP data when possible 2022-09-04 07:15:04 +00:00
Tobias Diekershoff dd59ad9032 Switching to 2022.09-rc 2022-09-04 08:49:18 +02:00
Tobias Diekershoff 6557efd786
Merge pull request #11882 from annando/warnings
Fix logger warnings/errors
2022-09-04 07:31:25 +02:00
Michael f7be610629 Fix logger warmings/errors 2022-09-03 13:32:41 +00:00
Hypolite Petovan 93acaff014
Merge pull request #11879 from annando/receive-reshare
Fix receiving of reshared posts
2022-08-31 21:55:04 -04:00
Michael 3e28d62bdb Fix receiving of reshared posts 2022-08-31 21:18:33 +00:00
Philipp 2a2e1a9e12
Merge pull request #11877 from annando/log-levels
Loglevels are adjusted
2022-08-31 21:52:59 +02:00
Michael cc43b567cb Some changes after code review 2022-08-31 19:03:37 +00:00
Michael 9ca470cc94 Reverted experimental change 2022-08-31 05:02:28 +00:00
Michael f7b85092b0 Some more changed log levels 2022-08-31 05:01:22 +00:00
Michael 757a5c2de9 Loglevels are adjusted 2022-08-30 19:45:30 +00:00
Hypolite Petovan 312e4d8844
Merge pull request #11872 from annando/warnings
Some more warnings and errors are fixed
2022-08-28 16:55:54 -04:00
Michael 3a840aa22d Some more warnings and erors are fixed 2022-08-28 19:27:21 +00:00
Philipp b8a1014a90
Merge pull request #11871 from annando/issue-11870
Issue 11870: Weeks can now start at every day
2022-08-28 13:09:54 +02:00
Michael 61cbcf85a1 Issue 11870: Weeks can now start at every day 2022-08-28 09:15:00 +00:00
Michael 3052ae71b7 Avoid warnings 2022-08-28 09:12:36 +00:00
Michael 4e02c347b6 Handle array 2022-08-28 04:14:39 +00:00
Hypolite Petovan 45729f0107
Merge pull request #11869 from annando/issue-11853
Issue 11853/11867: Fix reshare of public posts
2022-08-28 00:12:51 -04:00
Michael d54cf9cc21 Avoid warnings/fatal errors 2022-08-28 04:00:18 +00:00
Michael 2173fb38e0 Issue 11853/11867: Fix reshare of public posts 2022-08-27 21:22:49 +00:00
Hypolite Petovan 1e4e7d5b58
Merge pull request #11866 from annando/database2
Warnings/Errors reduces - relay processing improved
2022-08-27 08:40:53 -04:00
Michael a0eaff8fd5 Fix issue 11865 2022-08-27 11:43:46 +00:00
Michael ceb88c10e6 Warnings/Errors reduced - improved relay processing 2022-08-27 08:08:58 +00:00
Michael 1db70b8935 Merge remote-tracking branch 'upstream/develop' into database2 2022-08-25 18:48:24 +00:00
Michael dd8279afc2 Some more protection against database errors 2022-08-25 18:47:07 +00:00
Tobias Diekershoff fde853897f
Merge pull request #11863 from annando/database
Avoid some database errors
2022-08-25 13:49:05 +02:00
Michael 15d975f143 Avoid some database errors 2022-08-25 04:57:41 +00:00
Philipp 453667023e
Merge pull request #11860 from tobiasd/20220824-fr
FR translation update
2022-08-24 08:16:26 +02:00
Tobias Diekershoff 97992cf1c6 FR translation update 2022-08-24 07:23:26 +02:00
Tobias Diekershoff aaaf928650
Merge pull request #11857 from annando/diaspora-author-signature
Diaspora: Don't check the author signature when author = parent author
2022-08-22 15:02:57 +02:00
Michael 4e3102bfb3 Diaspora: Don't check the author signature when author = parent author 2022-08-22 09:54:29 +00:00
Hypolite Petovan 2957a3def6
Merge pull request #11855 from annando/contact-id2
The contact-id of a wall posting is always the owner contact
2022-08-22 04:26:45 -04:00
Michael 2a0ca80630 The contact-id of a wall posting is always the owner contact 2022-08-22 07:54:48 +00:00
Philipp 17a394e23c
Merge pull request #11854 from MrPetovan/bug/fatal-errors
Ensure Util\Profiler->rendertime is bool
2022-08-21 14:11:05 +02:00
Hypolite Petovan 5f62a59d2f Ensure Util\Profiler->rendertime is bool
- Address https://github.com/friendica/friendica/issues/11630#issuecomment-1221228589
- Address https://github.com/friendica/friendica/issues/11630#issuecomment-1221244898
- Address https://github.com/friendica/friendica/issues/11630#issuecomment-1221333918
2022-08-21 07:44:12 -04:00
Philipp 59b4f2e993
Merge pull request #11852 from Quix0r/fixes/double-quotes-single
Fixes/double quotes single
2022-08-19 19:18:21 +02:00
Roland Häder 4c6940583a
Changes:
- added missing type-hints
- first access level, then static
- reformatted code following code-style
2022-08-19 19:12:30 +02:00
Roland Häder b3906326a4
Changed:
- changed double-quotes to single
- added some empty lines for better readability
2022-08-19 19:12:29 +02:00
Tobias Diekershoff d0a011f049
Merge pull request #11849 from annando/contact-id
Improved contact-id detection
2022-08-19 17:48:05 +02:00
Michael 51331ced9b Improved function to fetch the contact id 2022-08-18 10:13:46 +00:00
Michael a4f1df68e4 Improved contact-id detection 2022-08-18 07:48:39 +00:00
Hypolite Petovan 037b4b7928
Merge pull request #11847 from annando/storeforuser
Improved checks in "storeForUserByUriId" to reduce recursion depth
2022-08-17 17:55:27 -04:00
Michael 531085890a Fetch the parent only - thread parents only on reshares 2022-08-17 19:39:20 +00:00
Michael 6070221364 Improved checks in "storeForUserByUriId" to reduce recursion depth 2022-08-17 05:28:24 +00:00
Hypolite Petovan efa1344c64
Merge pull request #11845 from annando/performance
Several performance improvements
2022-08-16 07:40:46 -04:00
Michael 3e2c684319 Some more index / fatal erros fixed 2022-08-16 11:23:47 +00:00
Michael bb52e5a804 Cascade on author deletion 2022-08-16 04:18:29 +00:00
Michael 4d617c9c48 This cache key doesn't exist anymore 2022-08-15 18:46:10 +00:00
Michael 5b3145d7ce Several performance improvements 2022-08-15 13:23:01 +00:00
Hypolite Petovan 946db2ab45 Normalize start_time and end_time parameter names in Friendica API event endpoints 2022-08-13 23:28:20 -04:00
pankraz bd02340162 new event APIs 2022-08-13 23:28:19 -04:00
Philipp 9be09f7df5
Merge pull request #11844 from Quix0r/fixes/call-get-on-null
Fixed "get() on NULL", PHP is case-sensitive here
2022-08-13 23:27:37 +02:00
Roland Häder c1c37da545
Changed double-quotes to single 2022-08-13 23:24:38 +02:00
Roland Häder 52d1b9905e
Fixes:
- fixed "get() on NULL invocation, PHP is case-sensitive here
- renamed $this->baseurl to $this->baseUrl (instance) in MoveToAvatarCache to
  make it same as everywhere else
2022-08-13 22:47:57 +02:00
Hypolite Petovan 579758d8b1
Merge pull request #11843 from Quix0r/fixes/this-in-static-context
fixed $this usage (kept) and got rid of static context
2022-08-13 16:37:52 -04:00
Roland Häder f579d687a9
Fixes:
- fixed $this usage (kept) and got rid of static context
- "imported" exception class
- added some nice text to it
2022-08-13 22:32:56 +02:00
Hypolite Petovan 21f3a56c42
Merge pull request #11841 from Quix0r/cleanups/type-hints-documentation
Cleanups/type hints + documentation
2022-08-13 10:43:11 -04:00
Hypolite Petovan 23cf850198
Merge pull request #11842 from annando/update-contact
Improved performance when updating contacts
2022-08-13 10:42:39 -04:00
Michael c6de91a8ec Don't delete the post when there is some undeleted post-user 2022-08-13 12:24:25 +00:00
Roland Häder 88cdb695b1
Changed:
- double-quotes to single
- more space around concated strings
- removed TODO as there is sadly no IOException in PHP
2022-08-13 13:35:50 +02:00
Michael bc3a6b2bb7 Return value added 2022-08-13 10:14:16 +00:00
Michael 5c5ae00370 Improved performance when updating contacts 2022-08-13 09:01:48 +00:00
Roland Häder ff5673e2d8
Changed:
- used $this->baseurl instead of DI::baseurl() (@MrPetovan)
2022-08-13 06:52:09 +02:00
Roland Häder cfa575b8e5
Changes:
- added missing type-hints
- added documentation
- removed parameter $baseURL while it can be locally get the same way but
  lesser parameter
- used ActivityNamespace::SALMON_ME
- changed double-quotes to single
2022-08-12 14:01:40 +02:00
Roland Häder 074bae33c9
Changes:
- added some missing type-hints
- added some documentation
- added some empty lines to `@return` statements (code-style convention)
2022-08-12 13:36:34 +02:00
Roland Häder 33c7abd376
Changes:
- methods should ALWAYS start lower-case, not upper
- documented a bit more
2022-08-12 13:13:54 +02:00
Roland Häder 9794ce0c87
Changes:
- added type-hint for $type parameter
- documented method
- unsupported verbs logged
2022-08-12 13:09:59 +02:00
Philipp a145712f04
Merge pull request #11837 from MrPetovan/task/remove-poke
Remove poke feature
2022-08-11 18:17:11 +02:00
Hypolite Petovan ec17216ded
Merge pull request #11840 from Quix0r/fixes/new-array-way
Reformatting and using [] instead of discouraged array()
2022-08-10 11:40:11 -04:00
Roland Häder ae9bd4f3f2
Changes:
- reformatted and documented private method
- used [] instead of deprecated/discouraged array()
2022-08-10 17:10:59 +02:00
Hypolite Petovan 809beeee9d
Merge pull request #11838 from annando/asynchronous-conversation
Conversation entries will now be stored asynchronous if possible
2022-08-10 10:42:19 -04:00
Michael e2896b449b Changes after code review 2022-08-10 13:43:00 +00:00
Michael d9aee0b3ea Conversation entries will now be stored asynchronous if possible 2022-08-10 09:28:18 +00:00
Hypolite Petovan 2c079757e0 Update main translation file after removing poke feature strings 2022-08-09 14:55:56 -04:00
Hypolite Petovan 4a885a13a6 Remove poke feature 2022-08-09 14:55:55 -04:00
Hypolite Petovan 119da8b58b
Merge pull request #11836 from tobiasd/20220809-lng
DE, ZH CN translation updates
2022-08-09 08:23:53 -04:00
Tobias Diekershoff 15d2aa5cfa fixed typo 2022-08-09 09:49:28 +02:00
Tobias Diekershoff 48e91d51c8 ZH CN translation updates THX shykana and xenoeye 2022-08-09 08:19:33 +02:00
Tobias Diekershoff a55b71856c DE translation update THX vinzv 2022-08-09 08:17:51 +02:00
Tobias Diekershoff 62be1c5614
Merge pull request #11835 from annando/sql-fetchqueue
Improve SQL-Queries / fixed "fetch_parents" setting
2022-08-08 23:00:48 +02:00
Michael 548b7f43a5 Improve SQL-Queries / fixed "fetch_parents" setting 2022-08-08 20:00:21 +00:00
Philipp 0e22120cd2
Merge pull request #11820 from fabrixxm/feat/smarty3foldersconfig
Add smarty3 dirs config
2022-08-08 19:00:12 +02:00
Hypolite Petovan 0cd64a3769 Updated main translation file after editing a string 2022-08-08 12:34:49 -04:00
fabrixxm 547b4684fd Add smarty3 dirs config
`FriendicaSmarty` get work dirs from config, with fallback if not set
2022-08-08 12:28:07 -04:00
Philipp e0ec304d2a
Merge pull request #11830 from MrPetovan/task/11826-pluralization
Use L10n->tt instead of t() for plural strings
2022-08-08 15:35:54 +02:00
Philipp 5ece6dcf41
Merge pull request #11833 from tobiasd/20220808-added_gd
added Gàidhlig language translation
2022-08-08 13:30:10 +02:00
Tobias Diekershoff 7634fc2425 added Gàidhlig language translation
This adds the initial translation of Friendica core into Gàidhlig by @gunchleoc

redo of #11818
2022-08-08 11:37:39 +02:00
Hypolite Petovan 63a448cad9 Update main translation file after adding pluralization forms 2022-08-08 02:15:24 -04:00
Hypolite Petovan 71084cf9f0 Use L10n->tt instead of t() for plural string in Module\BaseApi 2022-08-08 02:08:43 -04:00
Hypolite Petovan c19e57e176 Use L10n->tt instead of t() for plural strings in Module\Admin\Federation 2022-08-08 02:08:40 -04:00
Hypolite Petovan f917286d6e Use L10n->tt instead of t() for plural strings for polls in Model\Item 2022-08-08 01:52:16 -04:00
Hypolite Petovan bff6a5a9ee Add support for additional interpolated variables in L10n->tt() 2022-08-08 01:51:42 -04:00
Hypolite Petovan bbbbf8fd6b
Merge pull request #11827 from annando/loop-prevention
Improvements for message processing
2022-08-08 01:10:16 -04:00
Michael d60d2caef6 Improved queue processing 2022-08-07 19:24:50 +00:00
Michael 22c1873064 Merge remote-tracking branch 'upstream/develop' into loop-prevention 2022-08-06 17:11:04 +00:00
Michael 87a945b295 More prevention of double processing of the same content 2022-08-06 17:06:55 +00:00
Hypolite Petovan 963ebe9193
Merge pull request #11821 from tobiasd/20220805-typo
typo in console tool
2022-08-05 10:05:06 -04:00
Tobias Diekershoff 0f35b06978 updated the messages.po file 2022-08-05 15:52:04 +02:00
Hypolite Petovan d847d155ee
Merge pull request #11819 from fabrixxm/fix/wsod
Fix WSOD when Renderer throws exception
2022-08-05 09:40:48 -04:00
Tobias Diekershoff 91911c4676 typo in console tool
@gunchleoc spottet a typo while working on the translations of Friendica. This fixes it.
2022-08-05 15:37:38 +02:00
fabrixxm 704bd95608 Fix WSOD when Renderer throws exception
`HTTPException` builds a simple static version of error page if
`Renderer` throws any exception while rendering the error page.
2022-08-05 15:28:21 +02:00
Hypolite Petovan bd246b8cc2
Merge pull request #11817 from annando/double-processing
Avoid processing the same activity
2022-08-05 09:04:33 -04:00
Michael 8b698b183d Abort when public item cannot be inserted 2022-08-05 05:48:20 +00:00
Michael 8227367522 Remove test code, add documentation 2022-08-05 04:45:31 +00:00
Michael f222e9d278 Avoid to provess the same activity 2022-08-04 21:52:10 +00:00
Hypolite Petovan 2e00797ebc
Merge pull request #11816 from annando/fetch-parents
New option to disable the fetching of parents
2022-08-04 16:00:00 -04:00
Michael 06f7244280 New option to disable the fetching of parents 2022-08-04 19:32:36 +00:00
Hypolite Petovan f0c8b26bf1
Merge pull request #11815 from Quix0r/fixes/missing-private-array-key
Missing 'private' array key
2022-08-04 05:15:46 -04:00
Roland Häder 8105668caf
Added missing 'private' field, see Processor::processContent() where it is needed 2022-08-04 10:50:44 +02:00
Hypolite Petovan 196a1de7f2
Merge pull request #11812 from annando/ap-performance
Hopefully fixes loops during message processing
2022-08-03 03:00:50 -04:00
Michael e82ef8890b Only process entries for existing posts 2022-08-03 05:14:07 +00:00
Michael 3463e34693 Don't always fetch parent posts 2022-08-03 04:51:57 +00:00
Michael 23ef4a99bb Changes after code review 2022-08-03 04:31:56 +00:00
Michael f2eec66240 Hopefully fixes loops during message processing 2022-08-03 03:38:03 +00:00
Philipp 4c52318c4e
Merge pull request #11810 from MrPetovan/task/11794-password-length-limit
Add password length limit if using the Blowfish hashing algorithm
2022-08-02 17:52:26 +02:00
Hypolite Petovan 6857dbe71f Updated main translation file after adding strings 2022-08-01 12:25:36 -04:00
Hypolite Petovan 49394aedeb Add password length limit if using the Blowfish hashing algorithm
- Add new page to reset a password that would be too long
- Add support for pattern parameter in field_password
2022-08-01 12:12:18 -04:00
Hypolite Petovan 067f06b166 Rework return_path session key handling
- Add new IHandleSessions::pop() method
- Remove redirection from Authentication::setForUser()
- Add explicit return_path form parameter to Login::form()
2022-08-01 12:10:43 -04:00
Tobias Diekershoff 64894f9d6f
Merge pull request #11809 from annando/fetch-cache
Repeated fetch requests are now prohibited
2022-08-01 09:29:21 +02:00
Michael c8d1bf4cdf Code standards and updated database documentation 2022-08-01 07:06:30 +00:00
Michael 81b244f91e Option to activate or deactivate the background fetching 2022-08-01 06:59:20 +00:00
Michael f7ec8d5b8e Improved log message 2022-08-01 05:59:59 +00:00
Michael 7d5b4808cd Merge branch 'fetch' into fetch-cache 2022-08-01 05:57:59 +00:00
Michael 4be6e9a27d Cache if an activity has recently been fetched 2022-08-01 05:56:55 +00:00
Michael 6c7dfd6958 New table to control the fetching process 2022-08-01 04:48:49 +00:00
Hypolite Petovan 85dd69324e
Merge pull request #11806 from annando/post-reason
The post-reason / protocol is now filled in most cases
2022-07-31 23:28:13 -04:00
Michael 3945de5e3b No blubb allowed 2022-08-01 00:58:56 +00:00
Michael 0347f4fc66 Remove test code 2022-07-31 16:01:56 +00:00
Michael b6da15557b The post-reason / protocol is now filled in most cases 2022-07-31 15:54:35 +00:00
Tobias Diekershoff 1ecc2982ba
Merge pull request #11805 from annando/no-standard-decoupling
Decoupling is deactivated by default now
2022-07-31 12:25:01 +02:00
Michael 06a124338a Only store the inbox-queue on activated background processing 2022-07-31 08:10:47 +00:00
Michael 371f20a1aa Decoupling is deactivated by default now 2022-07-31 07:48:35 +00:00
Philipp da06878f6c
Merge pull request #11802 from annando/issue-11800
Issue 11800: Remove entry from queue in any case.
2022-07-30 10:07:46 +02:00
Michael 8b4bf890f8 Issue 11798: Handling of empty author 2022-07-30 05:30:08 +00:00
Michael f6d11e8401 Issue 11800: Remove entry from queue in any case. 2022-07-30 04:43:18 +00:00
Hypolite Petovan da48453931
Merge pull request #11801 from annando/no-zero
Don't add zero as receiver
2022-07-29 21:15:20 -04:00
Michael 6383b07022 Don't add zero as receiver 2022-07-29 22:56:53 +00:00
Hypolite Petovan 2e75d442a5
Merge pull request #11793 from Quix0r/reformatted-arrays
Reformatted some arrays for better readability
2022-07-29 17:54:53 -04:00
Hypolite Petovan 1df0393d04
Merge pull request #11796 from annando/post-reason
Improvements for the "post-reason"
2022-07-29 17:54:15 -04:00
Michael 13cd6259ec Updates messages.po 2022-07-29 21:32:58 +00:00
Michael 653aaf1e26 Merge branch 'post-reason' of github.com:annando/friendica into post-reason 2022-07-29 21:31:34 +00:00
Michael f9bf2424b1 Merge remote-tracking branch 'upstream/develop' into post-reason 2022-07-29 21:29:15 +00:00
Michael 699152e15e Add more post reasons 2022-07-29 21:28:22 +00:00
Michael Vogel fa3c5d6c5e
Update src/Content/Conversation.php
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2022-07-29 21:59:53 +02:00
Michael 0971bcf165 Make the tests happy 2022-07-29 16:05:04 +00:00
Roland Häder 1210e235fb
Extracted as variable to have 2 more array fields moved to array initialization. 2022-07-29 17:20:09 +02:00
Roland Häder 676ca36c52
Changes:
- reformatted arrays
2022-07-29 17:20:07 +02:00
Michael 2c32429d8d Fix test 2022-07-29 14:56:40 +00:00
Michael 80592f6365 Updated messages.po 2022-07-29 14:54:25 +00:00
Michael 81aaacc67d Improvements for the "post-reason" 2022-07-29 14:17:53 +00:00
Hypolite Petovan f97a80e2cb
Merge pull request #11795 from Quix0r/fixes/type-errors
Fixes/type errors
2022-07-29 08:10:13 -04:00
Roland Häder 95ac2aa54b
Fixed a possible NULL value (not valid, at least empty string) 2022-07-29 12:45:21 +02:00
Roland Häder f8ed028013
Changed back to $cdata. 2022-07-29 12:41:08 +02:00
Hypolite Petovan a20d05ba39
Merge pull request #11792 from Quix0r/fixes/get-request-value
Wrong variable name fixed (maybe copy-paste mistake) + used method instead of direct array access
2022-07-28 21:17:34 -04:00
Hypolite Petovan 34b141dddb
Merge pull request #11791 from Quix0r/fixes/type-hints-formattting
Fixed wrong type-hint
2022-07-28 18:52:48 -04:00
Roland Häder eaed3945d1
Changed:
- used `$this->getRequestValue($request, 'foo', <bar>)` instead of `$request['foo'] ?? <bar>`
- fixed wrong variable naming
- changed double-quotes to single
- see https://github.com/friendica/friendica/issues/11631#issuecomment-1196410497
2022-07-29 00:38:46 +02:00
Roland Häder 37bda3e5fb
Changes:
- fixed wrong type-hint uid => int
- added returned type-hint
- added some documentation
- formatted arrays a bit
2022-07-29 00:08:38 +02:00
Hypolite Petovan 5ec407699b
Merge pull request #11790 from annando/fetchactivity
Negative caching / config for receiver / fix fatals
2022-07-28 17:29:34 -04:00
Michael b63ad63c29 Config for receiver / fix fatals 2022-07-28 21:16:42 +00:00
Hypolite Petovan 6e7823eaaa
Merge pull request #11784 from MrPetovan/task/11779-blocklist-notification
Add email notification to all users on server domain pattern block list update
2022-07-28 16:26:51 -04:00
Michael f0499e7269 Use negative caching 2022-07-28 20:25:38 +00:00
Philipp d693bc1b2f
Merge pull request #11789 from annando/fetchactivity
Caching for fetched activities
2022-07-28 22:13:04 +02:00
Michael 1aacff4ce1 Fix fatal error 2022-07-28 19:35:25 +00:00
Michael d12c9a8f58 Caching for fetched activities 2022-07-28 19:05:04 +00:00
Hypolite Petovan 3ce8bc5c27
Merge pull request #11788 from nupplaphil/feat/woodpecker_files
Replace SFTP-publish with docker-publish
2022-07-28 14:49:15 -04:00
Philipp b6a9c3bb38
Replace SFTP-publish with docker-publish 2022-07-28 20:40:52 +02:00
Hypolite Petovan 71cba85f8c
Merge pull request #11787 from AlessandroLorenzi/f11581/translate_data
fix(frio): "Data" move header in template w/ l10n
2022-07-28 12:46:40 -04:00
Alessandro Lorenzi 94cf4fa37a
fix(frio): "Data" move header in template w/ l10n
fix: #11581
2022-07-28 18:10:01 +02:00
Hypolite Petovan f29d9be574
Merge pull request #11785 from annando/processing
Decoupling of relay posts / endless loop removed
2022-07-28 05:42:46 -04:00
Hypolite Petovan 97ccb4d2c4 Make server domain pattern block reason mandatory 2022-07-28 05:39:51 -04:00
Hypolite Petovan e35651c44a Updated main translation file after adding strings 2022-07-28 05:39:30 -04:00
Hypolite Petovan 5045f9e188 Add email notification to all users on server domain pattern block list update 2022-07-28 05:39:29 -04:00
Hypolite Petovan 1810b32c26 Move server domain pattern blocklist features to its own class
- Update tests
2022-07-28 05:38:50 -04:00
Hypolite Petovan e445975c20 Use DBA::quoteIdentifier in Database::escapeFields 2022-07-28 05:37:22 -04:00
Tobias Diekershoff 95b67f5e46
Merge pull request #11786 from Quix0r/revert-11783-logging-unsupported
Revert "Added logging of unsupported meta-tag records"
2022-07-28 08:15:46 +02:00
Roland Häder 09cb4c1540
Revert "Added logging of unsupported meta-tag records" 2022-07-28 06:00:58 +00:00
Michael a27274b3b4 Avoid loops at deletion / decoupling for relay posts 2022-07-28 05:29:47 +00:00
Michael 08e9b2cc12 Merge branch 'develop' of github.com:annando/friendica into develop 2022-07-28 03:57:39 +00:00
Hypolite Petovan 8d62fbcd49
Merge pull request #11783 from Quix0r/logging-unsupported
Added logging of unsupported meta-tag records
2022-07-27 22:18:52 -04:00
Roland Häder 8fb0fa2921
Added logging of unsupported meta-tag records 2022-07-28 04:10:57 +02:00
Hypolite Petovan f11f9866ba Merge remote-tracking branch 'annando/untrusted' into develop 2022-07-27 18:29:27 -04:00
Michael 3c71392f9e Avoid endless loop while deleting 2022-07-27 21:57:05 +00:00
Hypolite Petovan 206bda861e
Merge pull request #11780 from annando/untrusted
Improved handling of incoming posts / new activity relay
2022-07-27 17:27:26 -04:00
Michael 505191dec5 Decouple the processor from the receiver 2022-07-27 20:59:42 +00:00
Michael 3af55de978 Issue 11776 - process replies via a worker task 2022-07-27 20:03:28 +00:00
Michael 3a4a76ac56 Updated messages.po 2022-07-27 18:59:40 +00:00
Michael ff9dc1e291 Merge remote-tracking branch 'upstream/develop' into untrusted 2022-07-27 17:56:56 +00:00
Michael 86105635ca Improved message handling / new activity relay handling 2022-07-27 17:39:00 +00:00
Philipp 5cb5252095
Merge pull request #11777 from MrPetovan/task/11775-domain-block-import-export
Add download/upload feature for domain pattern block list
2022-07-27 18:28:53 +02:00
Hypolite Petovan ef82f679bf Updated main translation file after adding strings 2022-07-27 11:54:50 -04:00
Hypolite Petovan e11d3cfeb0 Add upload feature for domain pattern block list
- Add new /admin/blocklist/server/import route
- Add form on domain pattern blocklist index page
2022-07-27 11:54:50 -04:00
Hypolite Petovan 7d7a5a65e9 Add download feature for domain block list
- Add new /blocklist/domain/download route
- Add link on /friendica page
2022-07-27 11:54:50 -04:00
Hypolite Petovan 1b2182c43c Move system messages from boot to own class 2022-07-27 11:54:50 -04:00
Michael Vogel f9777ce0dc
Merge pull request #11770 from MrPetovan/bug/notices
Handle rare case where contact doesn't exist in Model\Group::getIdsByContactId
2022-07-25 21:01:12 +02:00
Hypolite Petovan 488f4dcaa4 Handle rare case where contact doesn't exist in Model\Group::getIdsByContactId
- Address https://github.com/friendica/friendica/issues/11632#issuecomment-1193953621
2022-07-25 12:07:42 -04:00
Hypolite Petovan 3523ec1717
Merge pull request #11771 from Quix0r/fixes/marcor-newapi
Rewrote to almost one block of array initialization
2022-07-25 11:59:43 -04:00
Roland Häder d1b21eaf42
Changes:
- use local variables
2022-07-25 17:53:54 +02:00
Roland Häder 1ac1db6173
Changed:
- rewrote to almost one block of array initialization
2022-07-25 16:49:01 +02:00
Michael Vogel 389e59b857
Merge pull request #11769 from MrPetovan/bug/fatal-errors
Fix wrong type-hint in Module/DFRN/Notify
2022-07-25 15:24:49 +02:00
Hypolite Petovan 65cd0def22 Fix wrong type-hint in Module/DFRN/Notify
- Address https://github.com/friendica/friendica/issues/11630#issuecomment-1193958648
2022-07-25 09:09:22 -04:00
Michael 7834359957 Merge remote-tracking branch 'upstream/develop' into untrusted 2022-07-24 21:58:49 +00:00
Michael b546173747 IMproved handling of untrusted posts 2022-07-24 21:58:09 +00:00
Hypolite Petovan a5d679ea95
Merge pull request #11759 from annando/enqueue-posts
Fetch missing posts via a queue
2022-07-24 15:38:44 -04:00
Michael 5ab94ea921 Option to store untrusted entries 2022-07-24 19:31:31 +00:00
Michael 51cc1f679f Added trust / isActivityGone 2022-07-24 14:26:06 +00:00
Michael 55b6a89c7c Optimizing 2022-07-24 13:49:57 +00:00
Michael 72bc92db62 Standards 2022-07-24 13:11:52 +00:00
Michael 6abb4d40d6 Handle changed parents 2022-07-24 13:09:35 +00:00
Michael 06280aa5a3 Recursively delete failed worker tasks 2022-07-24 09:26:52 +00:00
Michael c2b2e8ae9f Standards 2022-07-23 23:15:08 +00:00
Michael 073695b33c Funkwhale context file moved 2022-07-23 23:10:47 +00:00
Hypolite Petovan 37c3a92d2c
Merge pull request #11767 from Quix0r/fixes/double-quotes-to-single
Doubles-quotes to single, type-hints, doc
2022-07-23 17:12:50 -04:00
Roland Häder 86ef7c66d3
Changes:
- added some missing type-hints, thanks to @MrPetovan
2022-07-23 23:09:35 +02:00
Roland Häder ba1c1049d6
Changes:
- added some type-hints
- added some documentation
- used self::exists() instead of DBA::exists('user', ['uid' => $uid])
2022-07-23 21:58:00 +02:00
Roland Häder a2a7d04fa1
Changed double-quotes to single 2022-07-23 21:58:00 +02:00
Philipp b5c293762e
Merge pull request #11766 from MrPetovan/bug/11765-nodeinfo-usage
Add expected "usage.users" property to all versions of NodeInfo
2022-07-23 20:57:30 +02:00
Hypolite Petovan edc49ec9b4 Add expected "users" property to NodeInfo usage property for all versions 2022-07-23 13:21:44 -04:00
Michael 6a19639ac2 Standards 2022-07-23 14:10:07 +00:00
Michael 5d6eb4670a We now store the conversation as well 2022-07-23 13:58:14 +00:00
Michael abf39ff9cf Merge remote-tracking branch 'upstream/develop' into enqueue-posts 2022-07-23 12:55:34 +00:00
Michael 8c602071c2 Bookwyrm posts now work 2022-07-23 12:50:15 +00:00
Michael 7eb410bed7 Conversation/context is now stored 2022-07-23 06:52:43 +00:00
Philipp 805d6440e6
Merge pull request #11761 from tobiasd/20220722-zh-cn
update to the zh-cn translation THX shykana
2022-07-22 08:07:04 +02:00
Tobias Diekershoff 34e2ed614b
update to the zh-cn translation THX shykana 2022-07-22 07:32:20 +02:00
Michael 54cebf5a88 Remove test code 2022-07-21 12:42:26 +00:00
Michael 4c5e9f206e Remove ignored undo 2022-07-21 11:47:23 +00:00
Michael 99f7270e18 Improved workerqueue handling 2022-07-21 08:55:45 +00:00
Michael 3966bff8a1 Fix standards 2022-07-21 08:14:47 +00:00
Michael 2e39cebcb9 Process the replies 2022-07-21 07:08:17 +00:00
Michael 4930e77eb3 We are now setting the corresponding worker id 2022-07-21 07:05:38 +00:00
Michael 28fb022425 Reset the recursion depth at a different place 2022-07-21 06:26:31 +00:00
Michael c775833117 Use deferred tasks 2022-07-21 06:23:55 +00:00
Michael d4a536137d database.sql updated, standards fixed 2022-07-21 05:42:53 +00:00
Michael 4a1fb1da12 Hourly process pending queue entries 2022-07-21 05:33:01 +00:00
Michael 1d13574225 Fetching of missing posts is reworked 2022-07-21 05:16:14 +00:00
Hypolite Petovan 650e05bcb5
Merge pull request #11758 from Quix0r/fixes/wrong-variable-name
Fixed variable name + used empty()
2022-07-20 07:55:38 -04:00
Hypolite Petovan 561230d1ab
Merge pull request #11757 from annando/diaspora
Fix  processing of incoming Diaspora messages
2022-07-20 07:54:46 -04:00
Roland Häder 4b5ae32ec6
Changes:
- ops, fixed variable name (thanks to @annando)
- also used empty() for an empty array (and false/null)
2022-07-20 11:54:28 +02:00
Michael Vogel fc52296a77
Merge branch 'develop' into diaspora 2022-07-20 08:12:30 +02:00
Michael c20c0a1812 Restore the original functionality 2022-07-20 05:47:30 +00:00
Michael 138a15404f Fix processing of incoming Diaspora messages 2022-07-20 05:38:53 +00:00
Michael ee0da5d6f9 Fix processing of incoming Diaspora messages 2022-07-20 05:38:22 +00:00
Michael 7dcd02938d Remove entries from queue / relay detection 2022-07-20 05:37:40 +00:00
Philipp c35e11e01f
Merge pull request #11755 from tobiasd/fix11752
wrong parameter for BaseURL get in smoothly theme
2022-07-20 07:19:45 +02:00
Philipp 42655571eb
Merge pull request #11756 from tobiasd/20220720-pl
PL translation update THX strebski
2022-07-20 07:18:55 +02:00
Tobias Diekershoff 66d77112dc
PL translation update THX strebski 2022-07-20 07:03:05 +02:00
Tobias Diekershoff d6123976f5
wrong parameter for BaseURL get in smoothly theme
Fixes at least the smoothly aspect pf #11752 other themes brokeness could not be reproduced on my node.
2022-07-20 06:58:26 +02:00
Hypolite Petovan 163f0aa14d
Merge pull request #11754 from Quix0r/rewrites/protocol-diaspora
Rewrote a lot local variables in createProfileData() + other changes
2022-07-19 20:36:06 -04:00
Roland Häder 1fbda27aad
Changes:
- rewrote a lot local variables to an array and returned it instead of an
  anonymous array
- added more debug/warning logging in case something went wrong -> lesser guessing! ;-)
- changed double-quote to single
2022-07-20 01:08:15 +02:00
Hypolite Petovan d69ac56338
Merge pull request #11753 from Quix0r/fixes/missing-contact-array
Fixed missing $contact array, at least initialize it empty
2022-07-19 17:58:02 -04:00
Hypolite Petovan 078e619023
Merge pull request #11750 from Quix0r/fixes/type-hints-doctag
Fixes/type hints doctag
2022-07-19 17:57:28 -04:00
Roland Häder 2ef0566ba5
Fixed:
- "Undefined variable: contact in .../src/Protocol/Diaspora.php on line 4097
Trying to access array offset on value of type null in .../src/Protocol/Diaspora.php on line 4097"
- see https://github.com/friendica/friendica/issues/11632#issuecomment-1189465336
2022-07-19 23:46:09 +02:00
Roland Häder 3c540517e7
Ops 2022-07-19 23:40:29 +02:00
Roland Häder cf8698afe6
This is the correct way:
<?php
if (!isset($foo['account_removed) || $foo['account_removed'])
?>
2022-07-19 18:08:18 +02:00
Roland Häder 4e5179a7b3
Changes:
- added some missing type-hints
- fixed some documentation (e.g. empty * line between @param and @return/throws)
2022-07-19 18:02:38 +02:00
Hypolite Petovan 4a11773d7e
Merge pull request #11748 from Quix0r/fixes/e_notice-account_removed
Fixed E_NOTICE, for some strange reason 'account_removed' isn't around?
2022-07-18 18:23:42 -04:00
Roland Häder cb2a052a70
Fixed E_NOTICE, for some strange reason 'account_removed' isn't around? 2022-07-18 23:49:58 +02:00
Michael a676cf8bed Merge remote-tracking branch 'upstream/develop' into enqueue-posts 2022-07-18 14:05:04 +00:00
Michael ce38e63399 Add and delete entries 2022-07-18 14:03:49 +00:00
Hypolite Petovan 42d411712b
Merge pull request #11742 from annando/server-detection
Improved server detection
2022-07-18 08:50:59 -04:00
Hypolite Petovan 2e9d1a9046
Merge pull request #11746 from annando/warn
Check for GMP module
2022-07-18 08:49:50 -04:00
Michael ac47aed1b4 Merge remote-tracking branch 'upstream/develop' into enqueue-posts 2022-07-18 05:32:44 +00:00
Michael af8e059990 Renamed platform definition file 2022-07-18 03:48:19 +00:00
Michael 3bd706fcfc Superfluous todo removed 2022-07-18 03:32:49 +00:00
Michael 2f462ffa16 Store incoming posts in a queue 2022-07-18 03:31:00 +00:00
Hypolite Petovan 121607b8d9
Merge pull request #11740 from annando/json-ld
Improved JsonLD parsing
2022-07-17 17:44:53 -04:00
Hypolite Petovan 8cd6ec2e3f
Merge pull request #11743 from Quix0r/fixes/misc-fixes
Added missing @return documentation, double->single
2022-07-17 17:42:14 -04:00
Roland Häder db095b8559
Changes:
- double-quotes to single
- added missing `@return`
2022-07-17 22:54:52 +02:00
Michael 46fdd9893c Merge remote-tracking branch 'upstream/develop' into server-detection 2022-07-17 15:42:09 +00:00
Philipp 6175f9086e
Merge pull request #11747 from annando/fixes
Emergency fixes to fix a bunch of fatal errors
2022-07-17 16:34:53 +02:00
Michael 9a4be84853 Only check for string value 2022-07-17 13:13:14 +00:00
Michael 6882e70024 Match the documentation 2022-07-17 13:00:34 +00:00
Michael 2ddf37f32d Emergency fixes to fix a bunch of fatal errors 2022-07-17 11:47:12 +00:00
Michael 06698cc5f6 Test? 2022-07-17 09:31:44 +00:00
Michael f0fe323832 Possibly now the tests work 2022-07-17 09:17:07 +00:00
Michael 5188180094 Fixed test 2022-07-17 09:08:12 +00:00
Michael 760aecefd8 Test added 2022-07-17 09:02:28 +00:00
Michael 23953be7cb Merge remote-tracking branch 'upstream/develop' into warn 2022-07-17 08:51:46 +00:00
Michael 6454f9a32c Updated messages.po 2022-07-17 07:39:12 +00:00
Michael f2a4aecc05 Check for GMP module 2022-07-17 06:34:37 +00:00
Michael d52f52f45f Somed added documentation 2022-07-17 05:42:44 +00:00
Tobias Diekershoff 085254516c
Merge pull request #11745 from nupplaphil/bug/woodpecker
Fix CI / CD woodpecker pipeline
2022-07-17 07:07:31 +02:00
Philipp 3f7c98fd37
Fix CI / CD woodpecker pipeline
- Combination of `labels` and `matrix`-build is broken
2022-07-17 02:26:46 +02:00
Philipp 1894302011
Merge pull request #11739 from Quix0r/fixes/missing-return-statements
Fixes/missing return statements
2022-07-16 16:23:32 +02:00
Philipp 15323d91d4
Merge pull request #11741 from Quix0r/fixes/missing-array-object-type
Fixed E_NOTICE due to wrong array
2022-07-16 16:19:21 +02:00
Michael 0a19759e4f Fix wrong variable type 2022-07-16 13:44:35 +00:00
Michael 8b7cb5d9ef Merge remote-tracking branch 'upstream/develop' into server-detection 2022-07-16 12:44:21 +00:00
Roland Häder cb7f52cc6a
Fixed:
- $item is the proper array here,
- see https://github.com/friendica/friendica/issues/11632#issuecomment-1186119430
2022-07-16 12:19:09 +02:00
Michael 8db0e090d7 Merge remote-tracking branch 'upstream/develop' into json-ld 2022-07-16 09:33:24 +00:00
Michael 8cc362fb8b Improved JSonLD parsing 2022-07-16 09:25:12 +00:00
Michael abe3fd7605 Improved check for invalid certificates 2022-07-16 08:27:38 +00:00
Roland Häder ce7af4edb8
All these methods need to return an integer (0=Success) or otherwise doExecute()
will return NULL.
2022-07-16 08:17:47 +02:00
Roland Häder 3546d0aabe
This class has already been "imported". 2022-07-16 08:17:43 +02:00
Michael 896fd3fc91 Use the redirect value 2022-07-14 05:39:25 +00:00
Michael Vogel 974564f75e
Merge pull request #11735 from MrPetovan/bug/11732-frio-scheme-accent
[frio] Accept 0 as a valid content background transparency in frio/style.php
2022-07-14 05:37:38 +02:00
Hypolite Petovan c50b3d671e [frio] Accept 0 as a valid content background transparency in frio/style.php 2022-07-13 17:51:45 -04:00
Hypolite Petovan 5d1ed5e71f
Merge pull request #11734 from Quix0r/fixes/added-final-check-link_item
$link_item might be boolean (no record found) under rare conditions
2022-07-13 17:08:48 -04:00
Roland Häder a38209db1e
Changed:
- added a final check on $link_item, as it might not be initialized or no
  record was found, thanks to @AlfredSK for reporting this
- see #11632
2022-07-13 22:05:53 +02:00
Philipp 59a1ba4fae
Merge pull request #11733 from Quix0r/fixes/returned-type-hint
Added returned type-int "int"
2022-07-13 21:14:28 +02:00
Roland Häder 4cb5cadba8
Added returned type-int "int" 2022-07-13 21:10:50 +02:00
Hypolite Petovan 5d8ebffb4e
Merge pull request #11730 from HankG/bugfix-frio-display-settings-error
Fix frio settings display error setting scheme to custom type if null
2022-07-13 08:50:23 -04:00
Hank Grabowski 74252b5a31 Fix frio settings display error setting scheme to custom type if null 2022-07-13 08:40:54 -04:00
Tobias Diekershoff 1ca929ca36
Merge pull request #11729 from MrPetovan/bug/11723-maintenance-mode-view-module
Enable the view module in maintenance mode
2022-07-13 06:32:28 +02:00
Hypolite Petovan 1d94e2866a Enable the view module in maintenance mode
- This allows to load the default theme CSS
- Theme scripts have been updated to reflect the possibility they will be included in maintenance mode
2022-07-12 19:48:36 -04:00
Hypolite Petovan ac56dcd50f
Merge pull request #11728 from nupplaphil/feat/split_db_definitions
Split DBStructure & View
2022-07-12 18:57:35 -04:00
Philipp 74c5c66cb5
Add docs 2022-07-13 00:27:39 +02:00
Philipp d74e57ef2c
include suggested changes 2022-07-13 00:23:12 +02:00
Philipp 6ef609f4fb
Add dbview.config.php for vfs directory mocking 2022-07-12 23:46:21 +02:00
Philipp 41803cb731
Fix tests 2022-07-12 23:40:31 +02:00
Philipp a910fd8864
Split DBStructure & View to avoid DB-calls and dependencies for basic operations
- new "Definition" classes vor DB and Views
- new "Writer" classes to create SQL definitions for DB and Views
- DBStructure & View are responsible to execute DB-querys
2022-07-12 23:40:31 +02:00
Hypolite Petovan a2c929d128
Merge pull request #11727 from nupplaphil/bug/redirect
Fix HTTP Client redirect Bug
2022-07-12 15:24:58 -04:00
Philipp 8e547510a0
Fix HTTP Client redirect Bug 2022-07-12 20:11:53 +02:00
Philipp 83a16ac114
Add test case for https://github.com/friendica/friendica/issues/11726 2022-07-12 20:10:17 +02:00
Michael Vogel d9d30c7b06
Merge pull request #11725 from MrPetovan/bug/fatal-errors
Fix type hint typo in Protocol\Email::messageGetPart
2022-07-12 07:13:27 +02:00
Hypolite Petovan 74991d1f95 Fix type hint typo in Protocol\Email::messageGetPart
- Address https://github.com/friendica/friendica/issues/11724
2022-07-11 23:05:13 -04:00
Michael dad05f1c76 Only fetch the first word for the platform 2022-07-10 13:52:38 +00:00
Michael 85c7bacb00 Improved server detection 2022-07-10 13:01:47 +00:00
Hypolite Petovan 05ed13a279
Merge pull request #11719 from nupplaphil/feat/type_use
adhere `use` and type-hints :-)
2022-07-09 17:42:42 -04:00
Michael Vogel d87963d8a1
Merge pull request #11720 from MrPetovan/bug/fatal-errors
Remove unused uid parameter in Item::newURI
2022-07-09 13:52:57 +02:00
Hypolite Petovan eb8237dd89 Remove unused uid parameter in Item::newURI 2022-07-09 07:39:51 -04:00
Philipp e8fd495847
adhere use and type-hints :-) 2022-07-09 11:41:36 +02:00
Hypolite Petovan b31c2f4ec1
Merge pull request #11718 from HankG/feature-optional-network-group-count
Feature optional network group count
2022-07-08 20:40:22 -04:00
Hank Grabowski 96d3b5bcf1 Merge branch 'develop' into feature-optional-network-group-count 2022-07-08 15:35:26 -04:00
Hank Grabowski e57e1ba1e5 Make network counts at the group level system level configurable 2022-07-08 15:29:34 -04:00
Hypolite Petovan 12149ab4ea
Merge pull request #11717 from tobiasd/20220708-de2
DE translation updates THX FOSS+
2022-07-08 10:16:47 -04:00
Tobias Diekershoff cb92809736
DE translation updates THX FOSS+ 2022-07-08 15:33:12 +02:00
Philipp f02daef435
Merge pull request #11715 from tobiasd/20220708-de
DE translation updates
2022-07-08 08:29:38 +02:00
Tobias Diekershoff 16906cdd4a
DE translation updates 2022-07-08 08:23:25 +02:00
Hypolite Petovan 3e5b51b914
Merge pull request #11714 from nupplaphil/bug/trust
[2FA] Add a lot of log-points
2022-07-07 18:10:40 -04:00
Philipp 34f2b2f558
Add the right exceptions for BaseUrl::redirect and respect them when catching exceptions at the Trust page 2022-07-07 21:47:39 +02:00
Philipp e4a83eafb8
Add a lot of log-points 2022-07-07 21:33:41 +02:00
Hypolite Petovan 464fdb955c
Merge pull request #11711 from tobiasd/20220707_plsv
PL, SV translation updates THX strebski and viktorbagare
2022-07-07 08:47:31 -04:00
Tobias Diekershoff 28e2eab7ae
SV update to the strings THX viktorbagare 2022-07-07 11:08:05 +02:00
Tobias Diekershoff a82c874d5d
PL translation update THX strebski 2022-07-07 11:07:26 +02:00
Hypolite Petovan 4f77b1e2db
Merge pull request #11710 from Quix0r/fixes/type-error-send-contact-reject
Type-hint has to be string, instead of int
2022-07-06 03:56:12 -04:00
Roland Häder bf809c9d57
Fixed:
> TypeError: "Argument 2 passed to Friendica\Protocol\ActivityPub\Transmitter::sendContactReject()
> must be of the type int, string given

I followed here here the documentation, may fix #11708
2022-07-06 05:43:00 +02:00
Philipp 7b55f93027
Merge pull request #11709 from Quix0r/fixes/type-error-null-uri-id
Avoid TypeError because of missing "uri-id" entry
2022-07-05 19:38:18 +02:00
Roland Häder 4875524101
Fixed:
- added exception to prevent `TypeError` because of missing `uri-id` entry
- maybe fixes #11708
2022-07-05 18:53:51 +02:00
Michael cc75eb5d18 Improved server detection 2022-07-05 05:04:05 +00:00
Hypolite Petovan c88898df9c
Merge pull request #11705 from Quix0r/fixes/null-value-invocation
Fix for "Argument 1 passed to Friendica\Content\Text\BBCode::toPlaintext() must be of the type string, null given"
2022-07-03 08:57:23 -04:00
Roland Häder ba33c95e97
Fixes:
"Argument 1 passed to Friendica\Content\Text\BBCode::toPlaintext() must be of the type string, null given, called in /var/www/.../htdocs/mod/display.php on line 305"
2022-07-03 14:45:12 +02:00
Tobias Diekershoff e6ed8f6315
Merge pull request #11703 from MrPetovan/bug/fatal-errors
Fix fatal errors
2022-07-03 06:32:37 +02:00
Hypolite Petovan 181c142bb4 Remove overly strict type-hint in ActivityPub\Transmission::createCachedActivityFromItem
- Fix "Return value of Friendica\Protocol\ActivityPub\Transmitter::createCachedActivityFromItem() must be of the type array, bool returned" error
2022-07-02 22:16:59 -04:00
Hypolite Petovan e6feed65bf Rename Smilies::pregHeart to better match its purpose
- Fix "Argument 1 passed to Friendica\Content\Smilies::pregHeart() must be of the type string, array given" error
2022-07-02 22:14:20 -04:00
Tobias Diekershoff da7bc082b9
Merge pull request #11701 from Quix0r/fixes/missing-type-hints-getstart
Added missing type-hints
2022-07-01 06:40:54 +02:00
Roland Häder 3326c4cb31
Added missing type-hints, #11700 2022-07-01 02:50:34 +02:00
Hypolite Petovan ef5d178e00
Merge pull request #11699 from Quix0r/rewrites/type-hints-001
Type-hints added, method renamed
2022-06-30 12:25:20 -04:00
Roland Häder 90b0b33687
Changed double-quotes to single 2022-06-30 17:43:32 +02:00
Roland Häder 1ee0e6f711
Changes:
- no NULL anymore for 2nd parameter OEmbed::toHTML()
- some double-quotes to single
2022-06-30 15:03:12 +02:00
Roland Häder 6186aac792
Fixed type-hints 2022-06-30 14:58:45 +02:00
Roland Häder 99902bb478
Changes
- ops, also this needs change since null is no longer wanted
2022-06-30 14:52:37 +02:00
Roland Häder 5c0e8c62de
Changes
- renamed Widget::accounttypes() to Widget::accountTypes()
- fixed type-hint the documentation was wrong
2022-06-30 14:50:28 +02:00
Roland Häder 83cbe586ac
Changes
- renamed Item::visibleActivity() to Item::isVisibleActivity() as this returns
  a boolean value
- added some type-hints
- added some documentation
2022-06-30 14:18:13 +02:00
Roland Häder e33f5612ab
Changes:
- added some type-hints
- added some documentation
- changed some double-quotes to single
2022-06-27 15:16:18 +02:00
Roland Häder a392a22eee
Changes:
- added some type-hints
- fixed some documentation (void is lately returned, not null)
- added some documentation
2022-06-27 15:16:17 +02:00
Roland Häder 703ba1439b
Some empty lines 2022-06-27 15:16:17 +02:00
Roland Häder 98bc5216ef
A bit more documentation 2022-06-27 15:16:17 +02:00
Roland Häder 9871e9718e
Changes:
- added some type-hints
2022-06-27 15:16:16 +02:00
Roland Häder 6c5acf9ee0
Fixed:
- "Argument 3 passed to Friendica\Model\Photo::createPhotoForExternalResource()
  must be of the type string, null given
2022-06-27 15:16:16 +02:00
Roland Häder ff9707713b
Fixed:
- Friendica\Content\BoundariesPager::renderFull(int $itemCount) must be
  compatible with Friendica\Content\Pager::renderFull(int $itemCount): string
2022-06-27 15:16:15 +02:00
Hypolite Petovan 61d5f64933
Merge pull request #11697 from Quix0r/fixes/contact-user-isblocked-retuning-null
Fixed: TypeError: "Return value of Friendica\Model\Contact\User::isBlocked() must be of the type bool, null returned"
2022-06-27 07:57:55 -04:00
Roland Häder 8e19998191
Fixes:
- more "bool expected but null returned" errors
2022-06-27 13:49:53 +02:00
Roland Häder 7c049abfda
Fixed:
- Contact/User::isBlocked() needs to return boolean, but sometimes (strangely)
  a NULL can come from database, so let's cast it

This tries to fix:
TypeError: "Return value of Friendica\Model\Contact\User::isBlocked() must be of the type bool, null returned"
2022-06-27 11:39:18 +02:00
Hypolite Petovan 43531d5aa0
Merge pull request #11696 from Quix0r/fixed-twitter-api-empty-about
Fixed "Argument 1 passed to Friendica\Content\Text\BBCode::toPlaintext() must be of the type string, null given"
2022-06-26 18:46:15 -04:00
Roland Häder 4bdce6948f
Changed:
- $publicContact['about'] can be NULL, causing following error:
--------------------------
Argument 1 passed to Friendica\Content\Text\BBCode::toPlaintext() must be of
the type string, null given, called in /.../src/Object/Api/Twitter/User.php
--------------------------
The "expensive" code there can be avoided being called by an empty string or
NULL to increase performance.
2022-06-26 23:28:48 +02:00
Tobias Diekershoff e04ad87c15
Merge pull request #11693 from nupplaphil/feat/woodpecker
Use labels for woodpecker continuous deployments
2022-06-26 15:56:58 +02:00
Philipp 215187595d
Use labels for woodpecker continuous deployments 2022-06-26 15:45:58 +02:00
Philipp e594656a48
Merge pull request #11684 from MrPetovan/bug/11651-ap-fetch-queue
Create ActivityPub\FetchQueue and ActivityPub\FetchQueueItem classes
2022-06-26 13:36:19 +02:00
Philipp f39231eb2a
Merge pull request #11692 from MrPetovan/bug/fatal-errors
Convert potential spaces in Memcache(d) key names
2022-06-26 13:34:23 +02:00
Hypolite Petovan 91f5a7cc6b Convert potential spaces in Memcache(d) key names
- Address https://github.com/friendica/friendica/issues/11630#issuecomment-1166475036
- Add test for space in cache keys
2022-06-26 07:30:30 -04:00
Hypolite Petovan c9d829a679
Merge pull request #11690 from nupplaphil/feat/2fa_improv
2 Factor Authentication improvements
2022-06-26 05:42:58 -04:00
Philipp b67e488236
adaptions 2022-06-26 10:13:32 +02:00
Philipp 2248850f78
add anything .. 2022-06-25 23:06:42 +02:00
Philipp 123c116591
Update messages.po 2022-06-25 23:04:01 +02:00
Philipp 0223c030a9
Improve 2 factor usage 2022-06-25 23:04:00 +02:00
Philipp f3de8d7764
improve 2fa token field 2022-06-25 22:48:35 +02:00
Philipp 759d9d9f1a
Add more 2fa properties 2022-06-25 22:48:34 +02:00
Philipp b86ff1e970
Rename 2FA recovery message 2022-06-25 22:48:34 +02:00
Hypolite Petovan da32fa8fa6 Create ActivityPub\FetchQueue and ActivityPub\FetchQueueItem classes
- These classes are used to flatten the recursive missing activity fetch that can hit PHP's maximum function nesting limit
- The original caller is responsible for processing the remaining queue once the original activity has been fetched
2022-06-25 12:40:54 -04:00
Hypolite Petovan 3c70d592f6
Merge pull request #11689 from Quix0r/rewrites/double-quotes-single
Changed more double-quotes to single
2022-06-25 12:02:01 -04:00
Roland Häder e10dd20036
Made @TODO more clear? 2022-06-25 17:58:27 +02:00
Philipp 9527cd5cb3
Merge pull request #11688 from MrPetovan/bug/11635-mod-photos-posted
Replace obsolete posted sort field by created in mod\photos
2022-06-25 17:54:49 +02:00
Hypolite Petovan ee96c26ede Replace obsolete posted sort field by created in mod\photos 2022-06-25 11:46:54 -04:00
Hypolite Petovan 7c1ae71527 Add tests for BBCode::fetchShareAttributes 2022-06-25 11:46:53 -04:00
Hypolite Petovan a7d49877a8 Centralize share tag attribute extraction code in Content\Text\BBCode 2022-06-25 11:46:52 -04:00
Roland Häder 4164cdacf5
Changes:
- added type-hints
- added documentation
2022-06-25 16:48:37 +02:00
Roland Häder 804b759df1
Changes:
- let's get rid of that `Database::exists()` is being misused for checking table existence
- reformatted array
2022-06-25 16:48:37 +02:00
Roland Häder f689faca99
Changed double-quotes to single 2022-06-25 16:48:36 +02:00
Roland Häder 88870d18be
Changes:
- added some type-hints
- added documentation
2022-06-25 16:48:36 +02:00
Roland Häder 39675fe683
Space for the rescue. ;-) 2022-06-25 16:48:35 +02:00
Roland Häder b0693c1ad7
Reformatted array 2022-06-25 16:48:35 +02:00
Roland Häder f12cc9648e
Changes:
- added some type-hints
- changed some double-quotes to single
2022-06-25 16:48:35 +02:00
Roland Häder 9069abbb30
Changed doubled-quotes to single 2022-06-25 16:48:34 +02:00
Michael Vogel 8446de2aa6
Merge pull request #11685 from MrPetovan/bug/11638-gserver_site_name-length
Add explicit gserver.site_name string truncate in Model\GServer
2022-06-25 12:39:06 +02:00
Hypolite Petovan aa133b5437 Add explicit gserver.site_name string truncate in Model\GServer
- Avoids "Data too long for column 'site_name'" database errors
2022-06-25 06:25:48 -04:00
Philipp aa596df098
Merge pull request #11686 from MrPetovan/bug/11636-emailer-message-id-check
Fix off-by-one error in Message ID header count check in Util\Emailer
2022-06-25 11:58:23 +02:00
Hypolite Petovan a2afb101cd Fix off-by-one error in Message ID header count check in Util\Emailer 2022-06-25 05:35:24 -04:00
Tobias Diekershoff b9fe8ee38f
Merge pull request #11683 from MrPetovan/bug/fatal-errors
Fix a couple Fatal Errors
2022-06-25 11:20:33 +02:00
Hypolite Petovan c75dbfd3d7 Update default value for LocalRelationship->priority to avoid null values
- Address https://github.com/friendica/friendica/issues/11630#issuecomment-1166192993
2022-06-25 05:06:22 -04:00
Hypolite Petovan 636b84b41c Update return value type-hint of GServer::getProtocol
- Address https://github.com/friendica/friendica/issues/11630#issuecomment-1164880874
2022-06-25 05:06:22 -04:00
Hypolite Petovan c5b46fe748
Merge pull request #11681 from Quix0r/fixes/item-guidfromuri-allow-null
Allowing Item::getFromUri()'s 2nd parameter a null value
2022-06-24 10:15:26 -04:00
Hypolite Petovan 4cdc0ef267
Merge pull request #11680 from nupplaphil/feat/log_forward
Respect Forwarded-For headers
2022-06-24 10:12:19 -04:00
Roland Häder 82bb36e13d
Changes:
- Made Item::guidFromUri()'s $host parameter optional (allowing null)
- added some type-hints
- added documentation
- this may fix reported issue in #11630
2022-06-24 03:17:57 +02:00
Philipp 417b0072bb
Move documentation :-) 2022-06-23 23:24:15 +02:00
Philipp 2dc38e5632
Move documentation :-) 2022-06-23 23:23:36 +02:00
Philipp 5bf5b5e6c9
adaptions :-) 2022-06-23 23:01:09 +02:00
Philipp 12ba37e8d2
add more doc 2022-06-23 22:46:46 +02:00
Philipp 13783089e7
Add copyright 2022-06-23 22:44:17 +02:00
Philipp d441b90bda
Respect Forwarded-For headers 2022-06-23 22:42:35 +02:00
Hypolite Petovan dbc1ebbb5c
Merge pull request #11679 from Quix0r/rewrites/autotest
Rewrite of autotest.sh
2022-06-23 12:41:14 -04:00
Roland Häder 3aeeac5d98
Rewrite:
- rewrote autotest.sh and moved it to bin/dev/ as this is clearly a developer
  script
- the rewrite's goal is towards Shell/POSIX-compliance (e.g. ${VAR} and not $VAR)
2022-06-23 17:36:56 +02:00
Hypolite Petovan d322e9288b
Merge pull request #11677 from Quix0r/rewrites/type-hints-doc-001
Rewrites/type hints doc 001
2022-06-23 11:34:52 -04:00
Roland Häder 657a8a7cb5
Changes:
- documented null value
- two ' to much!
2022-06-23 17:30:17 +02:00
Roland Häder 202857ba7d
No need to log $tid here 2022-06-23 17:30:17 +02:00
Roland Häder fd8f4269ff
Reformatted code 2022-06-23 17:30:17 +02:00
Roland Häder 5699b03e8d
Changes:
- added some nodes to OpenSearch descriptor
- still no UTF-8 encoding!
- added some type-hints
2022-06-23 17:30:16 +02:00
Roland Häder a49fb9cbf9
Changes:
- added some type-hints
- added documentation
2022-06-23 17:30:16 +02:00
Roland Häder 84d3eecc33
Changes:
- added some type-hints
- changed double-quotes to single
2022-06-23 17:30:15 +02:00
Roland Häder 57e741f2cf
More type-hints added 2022-06-23 17:30:15 +02:00
Roland Häder 182c3db9b8
Changes:
- added type-hints
- added missing documentation
2022-06-23 17:30:15 +02:00
Roland Häder b8353a6eb7
Changes:
- reformatted some array
- added missing documentation
- added type-hints
- changed double-quotes to single
2022-06-23 17:30:14 +02:00
Roland Häder c6c936a80f
Added more type-hints 2022-06-23 17:30:14 +02:00
Roland Häder 3f74a59f73
Added some type-hints 2022-06-23 17:30:14 +02:00
Roland Häder 69a68be800
Added some missing type-hints 2022-06-23 17:30:13 +02:00
Roland Häder f889aeffb3
Changes:
- changed double-quotes to single
- added type-hints
2022-06-23 17:30:13 +02:00
Roland Häder d8ff966d21
Throw IAE again (should never become visible) 2022-06-23 17:30:13 +02:00
Roland Häder 35c78ce14c
Ops, cannot return Thread? 2022-06-23 17:30:12 +02:00
Roland Häder c2e26b4f49
Changed:
- Introduced InvalidArgumentException (should never come)
- added type-hints
2022-06-23 17:30:12 +02:00
Roland Häder 2f3705f471
Continued:
- renamed varibales to $camelCase
- added type-hints
- updated documentation
2022-06-23 17:30:11 +02:00
Hypolite Petovan 0322456f70
Merge pull request #11678 from Quix0r/fixes/send-contact-accept-id-string
Fix for Transmitter::sendContactAccept() wrong 2nd parameter type
2022-06-23 11:05:38 -04:00
Roland Häder 0ddb315b23
$id in Transmitter::sendContactAccept() is a string, see Introduction class 2022-06-23 16:48:00 +02:00
Hypolite Petovan bf600905d3
Merge pull request #11676 from Quix0r/fixes/array-element-missing
Maybe this fixes missing array element
2022-06-23 09:06:59 -04:00
Hypolite Petovan 859af16cca
Merge pull request #11675 from Quix0r/features/smarty-sub-directories
Enabled sub-directories for compiled/cache Smarty3 files
2022-06-23 09:06:06 -04:00
Roland Häder 636fef26f1
Maybe this fixes missing array element 2022-06-23 07:40:49 +02:00
Roland Häder 589d0360a4
So simple ... Ops! 2022-06-23 04:58:45 +02:00
Roland Häder 69676c9f7b
Changes:
- enabled sub-directories for compiled/cached files which avoids large+slow
  directory descriptors
- changed some double-quotes to single
2022-06-23 04:24:55 +02:00
Hypolite Petovan b2aee2cf29
Merge pull request #11674 from nupplaphil/dep/guzzle
Bump guzzlehttp/guzzle from 6.5.5 to 6.5.8
2022-06-22 15:07:42 -04:00
Philipp e3aed8099c
Merge pull request #9 from nupplaphil/dependabot/composer/guzzlehttp/guzzle-6.5.8
Bump guzzlehttp/guzzle from 6.5.5 to 6.5.8
2022-06-22 20:23:38 +02:00
Hypolite Petovan c824ba43d5
Merge pull request #11673 from Quix0r/bugs/returned-type-array-bool
Fixed: ?? didn't work here as bool won't be seen as null
2022-06-22 13:29:39 -04:00
Roland Häder 7eefb9aed8
Changed:
- empty() is maybe superflous here, still I would prefer a code style that is
  written explicitly and not rely on "magic casting"
2022-06-22 18:57:01 +02:00
Roland Häder 15d8341d9a
Converted multiple single-comment (//) to multi-line comment block (/* */) 2022-06-22 18:06:35 +02:00
Roland Häder b996712ef7
Images::getInfoFromURL[Cached]() will both return empty arrays on error and
that needs to be reflected here, too.
2022-06-22 17:20:59 +02:00
Roland Häder eb231bc548
Fixed: ?? didn't work here as bool won't be seen as null 2022-06-22 17:09:53 +02:00
Philipp 78bf7f187c
Merge pull request #11669 from MrPetovan/bug/11666-email-subject-double-encode 2022-06-22 16:51:23 +02:00
Hypolite Petovan b96daeeeef
Merge pull request #11670 from Quix0r/fixes/more-type-hints-004
Fixes/more type hints 004
2022-06-22 10:49:20 -04:00
Roland Häder d5441da49a
Fixed:
- TypeError: "Argument 1 passed to Friendica\Util\XML::escape() must be of the
  type string, null given, called in src/Util/XML.php line 171
2022-06-22 16:20:26 +02:00
Roland Häder 101cd2dd10
Changes:
- added some documentation
- fixed some documentation
- changed more double-quotes to singl
2022-06-22 16:14:14 +02:00
Roland Häder ba45e59313
Changes:
- added more type-hints
- added missing documentation
- Email::send() now returns what mail() returns (bool)
2022-06-22 14:36:48 +02:00
Roland Häder ee8d0ad619
Changes:
- added more type-hints
- added some documentation
2022-06-22 14:36:47 +02:00
Roland Häder feec96cbc4
Return empty array on error (I hope it works this way). 2022-06-22 14:36:47 +02:00
Roland Häder 2dd7d465e8
Changes:
- added more type-hints
- updated documentation
- changed double-quotes to single
2022-06-22 14:36:47 +02:00
Roland Häder 74ab7648c6
Changes:
- addHubLink()'s 2nd parameter is DOMElement
- added more type-hints
- converted double-quotes to single
2022-06-22 14:36:46 +02:00
Roland Häder 12add2fb64
$data can turn into bool here 2022-06-22 14:36:46 +02:00
Roland Häder 08f55f0358
Ops, forgot to rename these, too. 2022-06-22 14:36:46 +02:00
Roland Häder abd0d9f3fd
Changes
- added type-hints
- added some documentation
- added default: block for unknown 'rel' value
- changed return type void to empty array
2022-06-22 14:36:45 +02:00
Roland Häder dfa95ea58d
Changes:
- added type-hints
- added documentation
2022-06-22 14:36:45 +02:00
Roland Häder 84bfc37bf1
Changes:
- added more type-hints
- added missing documentation
2022-06-22 14:36:45 +02:00
Tobias Diekershoff fa973d3b0f
Merge pull request #11671 from MrPetovan/bug/fatal-errors
Add expected type-hint to BoundariesPager::renderFull
2022-06-22 14:30:39 +02:00
Hypolite Petovan e9f7bb477d Add expected type-hint to BoundariesPager::renderFull
- Address https://github.com/friendica/friendica/issues/11630#issuecomment-1162634199
2022-06-22 07:49:45 -04:00
Hypolite Petovan 7295138f8d Remove type-hint inconsistent with expected return value in Database->getVariable 2022-06-22 07:47:15 -04:00
Hypolite Petovan d68f307337 Remove email subject encoding from ItemCCEmail constructor
- It was wrongly re-encoded in Emailer::send
2022-06-21 21:12:09 -04:00
Hypolite Petovan a05baaf249
Merge pull request #11668 from Quix0r/renames/logger
Renamings in logger class to make them more clear
2022-06-21 20:52:19 -04:00
Roland Häder 2f358607c7
Changes:
- renamed Logger::getLogger() to getInstance() (@MrPetovan)
2022-06-22 01:50:10 +02:00
dependabot[bot] 6443713af1
Bump guzzlehttp/guzzle from 6.5.5 to 6.5.8
Bumps [guzzlehttp/guzzle](https://github.com/guzzle/guzzle) from 6.5.5 to 6.5.8.
- [Release notes](https://github.com/guzzle/guzzle/releases)
- [Changelog](https://github.com/guzzle/guzzle/blob/6.5.8/CHANGELOG.md)
- [Commits](https://github.com/guzzle/guzzle/compare/6.5.5...6.5.8)

---
updated-dependencies:
- dependency-name: guzzlehttp/guzzle
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-21 20:47:00 +00:00
Roland Häder cdcfb4064b
Changes:
- added type-hints
- added missing documentation
- renamed Logger::getWorker() to Logger::getLogger() as there is no worker class
  returned but the actual (inner) logger
2022-06-21 21:22:16 +02:00
Hypolite Petovan 1c57ea7f75
Merge pull request #11665 from Quix0r/rewrites/dba-array-string-table
Rewrites/dba array string table
2022-06-21 15:15:57 -04:00
Roland Häder 8092188991
Added important comment from @nupplaphil@github.com 2022-06-21 21:12:59 +02:00
Roland Häder f38ad168f5
Reverted and improved TODO:
------
@nupplaphil: There is no easy possibility to add a logger here, that's why there
isn't any yet and instead a placeholder.. This execution point is a critical
state during a testrun, and tbh I'd like to leave here no further logic (yet)
because I spent hours debugging cases, where transactions weren't fully closed
and strange/unpredictable errors occur (sometimes -mainly during debugging other
errors :) ...)
-----
2022-06-21 19:21:25 +02:00
Roland Häder 80c8ec17c2
Fixed documentation 2022-06-21 18:43:25 +02:00
Roland Häder 0332a57bfd
Rewrote to suggestions from @MrPetovan (I tried to maintain the old way of
['scheme' => 'table'] with my version).
2022-06-21 18:13:01 +02:00
Roland Häder 3b8d9a7248
Use protected $this->logger instead 2022-06-21 17:54:48 +02:00
Roland Häder 9ccb113530
Ops, autorun.sh is there but looks like lesser "multi-project" friendly as
MYSQL_* must be defined. I might still use my version as that is
project-specific.
2022-06-21 17:48:10 +02:00
Roland Häder dcedd2e5d9
Ops, WWORD ... 2022-06-21 13:54:03 +02:00
Roland Häder 5e57ad4d44
Added simple wrapper script to run PHPUnit tests for you. To use this, you need
to set at least 4 variables in your ~/.bashrc (recommended):

export FRIENDICA_MYSQL_HOST="localhost"
export FRIENDICA_MYSQL_DATABASE="friendica_test"
export FRIENDICA_MYSQL_USER="friendica_test"
export FRIENDICA_MYSQL_PASSWWORD="friendica_test"

Then you can put ./bin/dev/run_tests.sh into your .git/hooks/pre-commit file
2022-06-21 13:47:40 +02:00
Roland Häder 5fe428d3e4
Fixed:
- PHPUnit\Framework\Error\Notice:  Undefined index: language in /.../src/Util/EMailer/MailBuilder.php on line 122
2022-06-21 13:47:40 +02:00
Roland Häder a7651fa1d5
Changes:
- let's at least log the error message, yes it does flood your logfile
2022-06-21 13:47:40 +02:00
Roland Häder 1080a840f5
Changes:
- Database->$driver can no longer be NULL, an empty string is fine anyway
2022-06-21 13:47:39 +02:00
Roland Häder 945cd1a2c2
Fixed:
- since $table can be now schema.table, this needs being taken care off
- maybe this foreach(explode()) is a bit an overkill as only 1 or 2 entries
  can be found in it
2022-06-21 13:47:39 +02:00
Roland Häder 0d81a08e3c
WIP: Properly some fixes? Also why is DROP VIEW IF EXISTS is being killed? 2022-06-21 13:47:39 +02:00
Roland Häder 44a9ec9b17
Rewrite:
- avoid having array|string for $table to have a "string" type-hint for $table
- you now have to do it for yourself by giving 'schema.table' as parameter
2022-06-21 13:47:38 +02:00
Roland Häder f62c28008a
Removed comment 2022-06-21 13:47:38 +02:00
Roland Häder cefffde691
Changes:
- added type-hints
- added some missing documentation
2022-06-21 13:47:37 +02:00
Roland Häder f1867463a0
Changes:
- added more type-hints
2022-06-21 13:47:37 +02:00
Roland Häder 77c37ff2db
Fixed:
- Uncaught Exception TypeError: "Argument 3 passed to
  Friendica\Protocol\DFRN::createActivity() must be of the type string, null
  given, called ..."
2022-06-21 13:47:37 +02:00
Hypolite Petovan e6ddb167f6
Merge pull request #11664 from tobiasd/20220621-fr
update FR translations THX kalon33
2022-06-21 07:43:12 -04:00
Tobias Diekershoff 4650ff53d9
Merge pull request #11662 from MrPetovan/bug/11661-splitattachment-null
Ensure parameter 4 of Post\Media::splitAttachment is a boolean value
2022-06-21 06:48:52 +02:00
Tobias Diekershoff fff6e30782
update FR translations THX kalon33 2022-06-21 06:45:14 +02:00
Hypolite Petovan d2ca812647
Merge pull request #11660 from Quix0r/fixes/more-type-hints-003
More type-hints - Batch 003
2022-06-20 21:53:17 -04:00
Roland Häder 3e522ed512
Fixed:
- prevent NULL from being handled over to XML::escape()
- still I wonder that an object can be? It is a string-only accepting method
2022-06-21 01:42:37 +02:00
Roland Häder 95f9eb34ac
Fixed indenting 2022-06-21 01:29:33 +02:00
Hypolite Petovan ee9bc338a5
Merge pull request #11663 from Quix0r/composer/upgrade
Updated composer.phar
2022-06-20 19:17:13 -04:00
Roland Häder b6fa022a73
Changes:
- added type-hints
- added some documentation
- marked some generic methods to be moved to Util\Strings class instead
2022-06-20 23:50:24 +02:00
Roland Häder 6a98ffa330
Updated composer.phar 2022-06-20 22:55:21 +02:00
Roland Häder fbae0b8bcf
Changes:
- renamed ItemArrayFromMail() to getItemArrayFromMail() to follow naming-convetion
- added missing type-hints
- added missing documentation
2022-06-20 21:22:46 +02:00
Roland Häder ea22e88896
Added documentation 2022-06-20 21:02:34 +02:00
Roland Häder 752953e472
Changes:
- as @MrPetovan pointed out, $actor can be NULL earlier and used later as NULL
- added some missing type-hints
- added missing documentation
- the added @TODO points out to avoid true|false|null for a boolean
2022-06-20 21:00:19 +02:00
Hypolite Petovan 88eacbf66e Ensure parameter 4 of Post\Media::splitAttachment is a boolean value 2022-06-20 14:34:02 -04:00
Roland Häder 0c12e947dd
Changes:
- null was 2nd argument's value before, an empty string is basically the same here
2022-06-20 20:01:59 +02:00
Roland Häder feb87e8dc3
Changes:
- let's start throwing exceptions on e.g. invalid arguments instead of returning
  FALSE
2022-06-20 19:09:08 +02:00
Roland Häder 4fb03cf163
Changes:
- fixed a null value handled over to Friendica\Model\APContact::getByURL()
- added missing type-hints
2022-06-20 19:05:02 +02:00
Roland Häder e96a548286
Changes:
- dumped default value for $input
- added unknown 'platform' which prevents an "Undefined index: platform in
  /var/www/.../src/Model/GServer.php on line 940" error
2022-06-20 18:56:22 +02:00
Roland Häder e5cc7a5ab1
Fixes:
- Strings::isHex() should not be misused for checking on NULL
2022-06-20 08:25:45 +02:00
Roland Häder 6743de63f5
Changed:
- DBA::exists() should only be used for checking if records exists.
- if you want to check if a table exists, please ALWAYS use
  DBStructure::existsTable() instead
2022-06-20 08:20:07 +02:00
Roland Häder cc750d743b
Changes:
- some methods now need to return bool to be compatible
- added some missing type-hints
2022-06-20 08:12:54 +02:00
Roland Häder 9c80dd35e5
Both declarations must be the same 2022-06-20 08:07:12 +02:00
Tobias Diekershoff 13a5a30b28
Merge pull request #11659 from MrPetovan/bug/11511-relocate-quote-identifier
Add missing identifier quote in Database->replaceInTableFields
2022-06-20 06:26:33 +02:00
Roland Häder cd3b01fd82
Changed:
- cannot have type-hints :-(
2022-06-20 03:48:34 +02:00
Roland Häder 94a594eeb2
Ops, wrong type-hint 2022-06-20 03:36:36 +02:00
Roland Häder ec96f2252e
Changes:
- added type-hints
- added some missing documentation
2022-06-20 03:10:23 +02:00
Roland Häder 14bf72e4fe
Changes:
- added some documentation
- added type-hints
2022-06-20 02:48:05 +02:00
Roland Häder 97904ea7dd
Changes:
- added type-hints
- added missing documentation
2022-06-20 02:48:02 +02:00
Roland Häder a0c8fc6d6e
Changes:
- added more type-hints
2022-06-20 02:48:02 +02:00
Hypolite Petovan 7528b79469
Merge pull request #11657 from Quix0r/fixes/post-media-size-bigint
Size "mediumint" wasn't enough
2022-06-19 20:23:29 -04:00
Hypolite Petovan d48e40c1bf Add missing identifier quote in Database->replaceInTableFields
- This caused hyphenated table names to fail the replace query
2022-06-19 20:06:12 -04:00
Roland Häder d276f2c62b
Changes:
- added type-hints
- changed some double-quotes to single
2022-06-20 01:00:29 +02:00
Roland Häder 8c38265b37
Changes:
- `url` to `varbinary(1024)`
 - `preview` to `varbinary(512)`

as the previous once (half length) were not enough in real-life scenarios
2022-06-19 23:09:29 +02:00
Roland Häder 2512449751
Incremented again 2022-06-19 15:36:16 +02:00
Roland Häder 9f24a4b60e
Fixed documentation/SQL dump with ./bin/console dbstructure dump 2022-06-19 15:36:16 +02:00
Roland Häder 96954e2b18
Size "mediumint" wasn't enough:
https://digitalcourage.video/static/webseed/5a039eb2-9fbc-441d-a772-59ae3ee65c15-1080.mp4 has 6758472669 Bytes

So let's go REALLY big.
2022-06-19 15:36:15 +02:00
Hypolite Petovan 622b978a84
Merge pull request #11655 from Quix0r/fixes/more-type-hints-002
More type-hints and documentation added
2022-06-19 09:27:29 -04:00
Roland Häder 5a553df7d8
Incremented database version 2022-06-19 14:41:36 +02:00
Roland Häder ed3c53a5f8
Ops, not here wanted. :-( 2022-06-19 14:06:32 +02:00
Roland Häder bff57bb030
Changes:
- added type-hints
- added returned type-hints in interface (I checked all)
2022-06-19 14:00:31 +02:00
Hypolite Petovan 777872e6fa
Merge pull request #11658 from tobiasd/20220619-accesskey
Accesskey was used twice
2022-06-19 07:09:20 -04:00
Roland Häder c0d7f8944d
Some calls saved 2022-06-19 11:26:10 +02:00
Roland Häder 60f8c2d795
Changes:
- added missing type-hints
- added documentation for a method
2022-06-19 10:50:09 +02:00
Roland Häder 5f6943b008
Changes:
- MySQL index on BLOB/TEXT can only be partial (e.g.: `column`(length))
2022-06-19 10:50:06 +02:00
Roland Häder 5792a01a01
Contact::getAccountType()'s parameter is never a string, ops 2022-06-19 09:36:24 +02:00
Roland Häder f3599fa3e9
Changes:
- dbstructure(null) is no longer possible, an empty string does it
2022-06-19 09:13:10 +02:00
Tobias Diekershoff 065dad79ca
updated the Accesskey documentation accordingly 2022-06-19 06:33:21 +02:00
Tobias Diekershoff a063a89c57
Accesskey was used twice
The accesskey on the User Settings pages for the _account settings_ and the _two factor authentication_ were the same. This PR is assinging a new one to the 2FA.
2022-06-19 06:30:00 +02:00
Roland Häder b6bfe72083
Wrong returned type, has to be array 2022-06-19 02:40:07 +02:00
Roland Häder 7bb0cb5323
Changes:
- added more type-hints
- DBStructure::existsTable() does no longer need array support for table name
  because this is no longer used (good work!)
2022-06-19 02:11:12 +02:00
Roland Häder 2c5685c89c
Changes:
- changed to proper "use Foo\Bar;"
- added doctag
- added return type as this is fixed
2022-06-19 01:11:30 +02:00
Roland Häder d7d2ad77ff
Ops, also this! 2022-06-18 23:31:52 +02:00
Roland Häder 39f2d197ea
Changed to suggestings (back to original) + fixed typo in scalar type 2022-06-18 23:30:37 +02:00
Roland Häder 6f1d52cf71
Changed back to suggestions by @MrPetovan 2022-06-18 23:24:08 +02:00
Roland Häder 2f961b11bf
Naming-convention:
- variables should start lower-case: $image
2022-06-18 23:16:34 +02:00
Roland Häder fa14a02a19
Changes:
- added type-hints
- added documentation
- changed double-quotes to single
2022-06-18 23:12:52 +02:00
Roland Häder f3b57008b5
Proper type is string 2022-06-18 18:41:16 +02:00
Roland Häder 41f34c4261
Maybe fix for:
"Argument 1 passed to Friendica\Model\ItemURI::getIdByURI() must be of the type string, null given, called in Processor.php line 1219"
2022-06-18 18:30:50 +02:00
Roland Häder 9691bb06fb
Changes:
- added more type-hints
- added missing documentation
2022-06-18 18:21:29 +02:00
Roland Häder 94eb426151
Nodeinfo::getOrganization() doesn't need configuration object being inserted
when you have DI::config() around.
2022-06-18 17:56:33 +02:00
Roland Häder c29c49797a
Added missing type-hints 2022-06-18 17:52:46 +02:00
Roland Häder 4e437190c5
Renamed variable, no need for "orig_" prefix 2022-06-18 17:50:11 +02:00
Roland Häder a1a81cdc6b
Continued:
- changed some double-quotes to single
- added missing type-hints
- added missing documentation
- fixed indenting a bit
2022-06-18 17:46:34 +02:00
Roland Häder 8fc710f82a
Continued:
- added more type-hints
- added some missing documentation
- Return the result from DBA::delete() to let other methods know about it
2022-06-18 17:22:50 +02:00
Roland Häder 8ba3f13fae
Changes:
- added more type-hints
- added missing documentation
2022-06-18 17:09:46 +02:00
Roland Häder 7ec07178c8
Changes:
- added missing type-hints
- added missing documentation
2022-06-18 16:59:23 +02:00
Hypolite Petovan e90ad0c1cd
Merge pull request #11653 from Quix0r/fixes/more-type-hints
More type-hints added
2022-06-18 10:33:33 -04:00
Hypolite Petovan b2e5993314
Merge pull request #11654 from Quix0r/fixes/post-media-url-size
post-media has too small sizes for video files
2022-06-18 10:28:00 -04:00
Roland Häder 92a1d14e5e
Updated documentation and SQL dump, according to woodpecker tests 2022-06-18 16:02:33 +02:00
Roland Häder 8756d92316
Continued:
- prevents a "Return value of Friendica\Core\Worker::workerProcess() must be of the type array, bool returned"
2022-06-18 15:57:31 +02:00
Roland Häder 8aaf99c61d
Sizes increased for:
- video files that have sizes var being int allowes
- URLs that might be longer (e.g. magnet: URLs) than varbinary(511) allows
2022-06-18 15:31:47 +02:00
Roland Häder bd3a7b9877
Ops, needs to be a variable:
Error: "Cannot pass parameter 2 by reference" at /var/www/.../src/Module/DFRN/Poll.php line 36
2022-06-18 09:59:19 +02:00
Roland Häder 69cda4f760
Fixed TypeError: "Argument 1 passed to Friendica\Core\System::httpExit() must be
of the type string, null given, called in /var/www/.../src/Module/DFRN/Poll.php
on line 37"
2022-06-18 05:42:02 +02:00
Roland Häder 7cbb818c93
Set type-hint for parameter $data to SimpleXMLElement as $fields in dispatch()
is the same and being handled over.
2022-06-18 05:19:24 +02:00
Roland Häder 89302d0843
Some outside code relies on returned "false" 2022-06-18 05:06:18 +02:00
Roland Häder aaf5c323b6
Fixed indenting 2022-06-18 05:04:14 +02:00
Roland Häder adb4aea6ad
Changes:
- added some type-hints
- replaced most double-quotes (only Diaspora.php, later more) with single
- added some documentation
- normalized indenting in Diaspora.php (I hope I got all?)
2022-06-18 05:03:10 +02:00
Roland Häder 51f43278d6
Fixed incompatible types 2022-06-17 18:00:36 +02:00
Roland Häder 88c40f3336 Ops, wrong type again 2022-06-17 17:18:31 +02:00
Roland Häder a770634b95 Ops, wrong type 2022-06-17 17:18:31 +02:00
Roland Häder 36d56a4041 Continued:
- changed back to 'return false;' as other methods heavily rely on false instead
  of an empty array as pointed out by @heluecht@pirati.ca
- $fetched_contact should be initialized as an empty array, let's not make this
  code more crazier than it already is (see APContact::getByURL())
2022-06-17 17:18:31 +02:00
Roland Häder c467bff79f Some more type-hints added 2022-06-17 17:18:31 +02:00
Roland Häder 4f3321cc9f Nore fixes 2022-06-17 17:18:31 +02:00
Roland Häder 10bb7d5625 Possible fix for
Uncaught Exception TypeError: "Return value of
Friendica\Model\APContact::getByURL() must be of the type array, bool returned"
2022-06-17 17:18:31 +02:00
Roland Häder fdd237a090 Fix for "Uncaught Exception TypeError: "Argument 1 passed to
Friendica\Model\APContact::unarchiveInbox() must be of the type string, null
given" error message
2022-06-17 17:18:31 +02:00
Roland Häder 605e7d55b3 Continued:
- added more type-hints
- some methods in Diaspora returned void but integer was documented so I
  changed it to -1 to have a proper type-hint
2022-06-17 17:18:31 +02:00
Roland Häder 0c9aff8a09 Also need to declare $profile or otherwise an invocation of
Receiver::getReceiverForActor() will fail.
2022-06-17 17:18:31 +02:00
Roland Häder af8cd5ca86 Worker::getWaitingJobForPID() can also return FALSE on failure ... :-( 2022-06-17 17:18:31 +02:00
Roland Häder 227bab43a8 Ops, wrong type-hint here, must be string ($nickname can never be an integer). 2022-06-17 17:18:31 +02:00
Roland Häder f7c1eaa858 Continued:
- added type-hints
- removed out-dated documentation
- added some missing documentation
2022-06-17 17:18:31 +02:00
Roland Häder e484b6d6dc Continued:
- added more type-hints
- added some documentation
- Contact::getAccountType() should only process string, not null
2022-06-17 17:18:31 +02:00
Roland Häder 45b5f67bca Fix for non-existing record system.mobile_theme in config table 2022-06-17 17:18:31 +02:00
Roland Häder 5c9ce790bf Fixed:
- $object_data['actor'] can be null, but Receiver::getReceivers()'s 2nd
  parameter expect it to be string
2022-06-17 17:18:31 +02:00
Roland Häder 33768ea1c6 Some fixes:
- $gsid's default value cannot sadly be 0, it now must be null to allow some
  code work
- added some more type-hints
- documented a bit more
2022-06-17 17:18:31 +02:00
Roland Häder 4e53666c70 Added more type-hints 2022-06-17 17:18:31 +02:00
Roland Häder 7560dccc08 Added again more type-hints 2022-06-17 17:18:31 +02:00
Roland Häder 2766c7d9cf Continued:
- added more type-hints
- added some missing documentation
2022-06-17 17:18:31 +02:00
Roland Häder a587217f47 Fixed "Argument 4 passed to Friendica\Protocol\DFRN::processVerbs() must be of the type bool" 2022-06-17 17:18:31 +02:00
Roland Häder dd54e52575 MrPetovan brought the right one up:
> Since this is depending on remote systems, the log can quickly fill with unactionable messages.
2022-06-17 17:18:31 +02:00
Roland Häder c351099c5a Ops, bad type-hint here 2022-06-17 17:18:31 +02:00
Roland Häder 2c5595c358 Another incompatible method declaration fixed + type-hints added 2022-06-17 17:18:31 +02:00
Roland Häder 40d7f29a11 Continued:
- more type-hints
- fixed incompatible method declarations
2022-06-17 17:18:31 +02:00
Roland Häder 1edc6b3c3b Added more type-hints for "App" classes 2022-06-17 17:18:31 +02:00
Roland Häder 42b04f397b Added more type-hints 2022-06-17 17:18:31 +02:00
Roland Häder aa5f0d5ec1 Added more type-hints and documented a few methods 2022-06-17 17:18:31 +02:00
Roland Häder 97e27cb523 Added more type-hints 2022-06-17 17:18:31 +02:00
Roland Häder c2e889cfae Added more type-hints 2022-06-17 17:18:31 +02:00
Hypolite Petovan a8a21c7fb6
Merge pull request #11652 from Quix0r/fixes/causer-id
Misspelled braces causing "undefined index 'causer-id'" message
2022-06-17 10:12:22 -04:00
Roland Häder 5106bb2881
Added parenthesis 2022-06-17 09:41:11 +02:00
Roland Häder a903dbd77e
Wrong braces causing 'undefined index causer-id'. See #11632 2022-06-16 23:00:16 +02:00
Hypolite Petovan 51b31a846f
Merge pull request #11649 from Quix0r/fixes/return-type-fetch-content
Fixes incompatible returned type from HTTPSignature::fetch() method
2022-06-16 13:16:06 -04:00
Roland Häder 6035de6883
Continued:
- added more type-hints
- also cannot return FALSE when array is set
2022-06-16 19:06:41 +02:00
Hypolite Petovan 341d8860d1
Merge pull request #11647 from Quix0r/fixes/type-error-exception
Followup PR for bad #11624 PR
2022-06-16 11:53:15 -04:00
Roland Häder 51a7b5c584
Made also this one sweeter (null-coalscing) 2022-06-16 17:36:47 +02:00
Roland Häder 0e1f734b03
Also make this null-coalscing 2022-06-16 17:35:01 +02:00
Roland Häder e8fee5644b
Ops, syntax errors get unnoticed with a simple editor. :-( 2022-06-16 17:10:02 +02:00
Roland Häder 624e4c192c
Changed to null-coalscing style (??) as sugguested by @MrPetovan 2022-06-16 16:59:54 +02:00
Roland Häder 962b06bf41
Added check as suggested by @MrPetovan for empty $message. 2022-06-16 16:54:51 +02:00
Roland Häder f2b7326650
This will 2 things:
1) The first change prevents "expensive" code in HTML::toBBcode() to be executed
   just for an empty string which makes no sense.
2) The above change was maybe flawed as $apcontact['about'] would have never
   been created, not even empty which could have side effects

Thanks to @annando to make me rethink this part of code.
2022-06-16 16:54:50 +02:00
Roland Häder 7814ba4fc4
Fixes for bad invocations of HTML::toBBCode() (1st parameter is now string) 2022-06-16 16:54:50 +02:00
Roland Häder b200874f17
Ops:
- wrong way around (!empty($foo)) is proper
- also needed to be checked on $acitivty['content']
2022-06-16 16:54:50 +02:00
Roland Häder b1e4c0931a
Fixes and type-hints:
- added more checked type-hints as they prevent bad method invocations
- fixed TypeError for HTML::toBBCode() invocations with NULL as first (wrong)
  argument, thanks to @tobias@social.diekershoff.de pointing this out.
2022-06-16 16:54:49 +02:00
Hypolite Petovan bb57d45237
Merge pull request #11645 from Quix0r/fixes/e-notice_use
Fixed possible "Trying to access array offset on value of type bool" E_NOTICE
2022-06-16 08:45:50 -04:00
Roland Häder e9af4b5bb9
Shorter code, thanks to @annando pointing this out 2022-06-16 13:29:30 +02:00
Roland Häder 65da5246ca
Fixed possibble "Trying to access array offset on value of type bool" E_NOTICE
Signed-off-by: Roland Häder <roland@mxchange.org>
2022-06-16 10:07:41 +02:00
Tobias Diekershoff 13ef86d4a3
Merge pull request #11644 from Quix0r/fixes/file-permissions
Fixed file permissions
2022-06-16 10:02:31 +02:00
Roland Häder 58c48977ec
These files should never have executable files 2022-06-16 09:14:23 +02:00
Roland Häder fd0d4aedee
Font files should NEVER be executable
Signed-off-by: Roland Häder <roland@mxchange.org>
2022-06-16 09:13:48 +02:00
Hypolite Petovan 207bf58801
Merge pull request #11624 from Quix0r/fixes/type-hints
Added more known type-hints
2022-06-15 16:32:25 -04:00
Roland Häder 5fa954208a
Changes:
- ops, wasn't actually fixing `return;` to proper `return '';`
- added more type-hints
- added TODO ($uid is unused)
2022-06-15 22:28:33 +02:00
Roland Häder a3fa95e8e4
Changes:
- added more type-hints
- changed `return;` to `return '';` when `string` was requested as returned type-hint
  (thanks to @MrPetovan)
2022-06-15 22:05:38 +02:00
Roland Häder 34aee64349
Added more type-hints
Signed-off-by: Roland Häder <roland@mxchange.org>
2022-06-15 21:52:51 +02:00
Roland Häder 143e4c4a18
Added more known type-hints
Signed-off-by: Roland Häder <roland@mxchange.org>
2022-06-15 21:52:50 +02:00
Tobias Diekershoff 98954dd14e
Merge pull request #11643 from annando/avatar-path
You can now store the avatar in a separate folder and host
2022-06-15 06:25:31 +02:00
Michael 726c4dff7d You can now store the avatar in a separate folder and host 2022-06-15 03:59:26 +00:00
Hypolite Petovan f839cd3826
Merge pull request #11642 from annando/platform-default
Some more default avatars
2022-06-13 16:31:34 -04:00
Michael b816ae4db5 Some more default avatars 2022-06-13 20:07:54 +00:00
Michael Vogel 1eadcb4855
Merge pull request #11641 from tobiasd/20220613-lng
AR, FR and HU translation updates
2022-06-13 17:42:10 +02:00
Tobias Diekershoff 6d6f356446
AR translation updates THX ButterflyOfFire 2022-06-13 14:27:14 +02:00
Tobias Diekershoff 7614ace843
added HU translation THX Balázs Úr 2022-06-13 14:27:14 +02:00
Tobias Diekershoff cc77052817
update FR translations THX kalon33 2022-06-13 14:27:06 +02:00
Hypolite Petovan 663296b107
Merge pull request #11639 from annando/platform-default
Use platform specific default avatar pictures
2022-06-13 07:59:49 -04:00
Michael 70b9a8114d Improve license comment 2022-06-13 10:30:21 +00:00
Michael d9fb081db9 Using separate avatars for different peertube account types 2022-06-13 10:27:46 +00:00
Michael a47f1efec3 use correct image for Pleroma 2022-06-13 10:18:17 +00:00
Michael c1a64b77c0 Improved license text 2022-06-13 10:03:34 +00:00
Michael a5b5f9316d Updated database.sql and messages.po 2022-06-13 05:46:37 +00:00
Michael e0a0c57c44 Use platform specific default avatar pictures 2022-06-13 05:18:54 +00:00
Tobias Diekershoff 05a76a3dc2
initial CHANGELOG for the 2022.09 release 2022-06-11 10:07:04 +02:00
Tobias Diekershoff 13d7242463
pump version to 2022.09-dev 2022-06-11 10:06:02 +02:00
Tobias Diekershoff 7fe7d0c904
pump version to 2022.06, welcome Giant Rhubarb 2022-06-11 10:01:00 +02:00
Tobias Diekershoff 21028a4bf4
typos and a release date 2022-06-11 09:57:49 +02:00
Tobias Diekershoff ddbd1d9d7b
renew the date in the security.txt file 2022-06-11 09:54:47 +02:00
Tobias Diekershoff 5ec1891e0a
Merge pull request #11532 from tobiasd/2022.05-CHANGELOG
CHANGELOG for the 2022.06 release
2022-06-11 09:50:08 +02:00
Tobias Diekershoff 5bd3f62665
Merge pull request #11629 from annando/issue-11625
Issue 11625: Don't parse the title through Markdown
2022-06-11 09:14:13 +02:00
Tobias Diekershoff 5573540ecf late time issue closed 2022-06-11 09:13:20 +02:00
Michael d7d8a6ab55 Issue 11625: Don't parse the title through Markdown 2022-06-11 06:50:59 +00:00
Tobias Diekershoff 3394b65c60
Merge pull request #11628 from annando/api-pinned
API: Use the type field in the query for pinned posts
2022-06-11 08:29:28 +02:00
Michael 4cf46b9770 API: Use the type field in the query for pinned posts 2022-06-11 06:05:55 +00:00
Hypolite Petovan c0863d2fb9
Merge pull request #11627 from annando/api-pinned
API: Improve the performance for fetching pinned posts
2022-06-10 19:53:22 -04:00
Michael 176f0c1216 API: Improve the performance for fetching pinned posts 2022-06-10 22:38:46 +00:00
Hypolite Petovan 143120b9c4
Merge pull request #11626 from annando/api-status
API: Speed improvements when fetching posts
2022-06-10 16:52:05 -04:00
Michael 4157f816f5 Fix for account variable name 2022-06-10 20:32:21 +00:00
Michael 9a1abda314 Use "avatar" instead of "contact" 2022-06-10 20:26:57 +00:00
Michael 7e747b2f41 API: Speed improvements when fetching posts 2022-06-10 18:49:03 +00:00
Hypolite Petovan 37405567c1
Merge pull request #11622 from Quix0r/fixes/switch-db-current-max-update
Switched maximum database update with currently worked on to "current/max
2022-06-08 11:22:38 -04:00
Roland Häder 1e890e16ac
Switched maximum database update with currently worked on to "current/max" as
this is understandable that update X of maximum Y is applied.

Signed-off-by: Roland Häder <roland@mxchange.org>
2022-06-08 11:48:05 +02:00
Tobias Diekershoff 86837ddb4a
Merge pull request #11621 from annando/notice
Avoid notice when a contact couldn't be fetched
2022-06-08 07:42:20 +02:00
Michael Vogel a1a265091a
Merge pull request #11620 from tobiasd/20220608-lng
DR, RU translation updates
2022-06-08 07:37:50 +02:00
Michael 2064a2ce87 Avoid notice when a contact couldn't be fetched 2022-06-08 05:35:34 +00:00
Tobias Diekershoff 06769dfc91
DE translation updates 2022-06-08 07:21:10 +02:00
Tobias Diekershoff a18a95b870
RU translations THX SpcCw 2022-06-08 07:20:25 +02:00
Hypolite Petovan 2dc45af57a
Merge pull request #11619 from annando/update-community
Fix:  respected the account type on the community page update
2022-06-07 15:14:55 -04:00
Michael d2772908e4 Fix: respected the account type on the community page update 2022-06-07 18:52:46 +00:00
Hypolite Petovan 6b0b8848a4
Merge pull request #11618 from annando/forced-display-update
Fix forced updates on the display page
2022-06-07 13:55:15 -04:00
Michael d665b78ea8 Fix forced updates on the display page 2022-06-07 17:34:19 +00:00
Tobias Diekershoff df33b88eb1 some numbered issues closed, some more details added to the CHANGELOG 2022-06-07 07:55:24 +02:00
Michael Vogel 79205b8377
Merge pull request #11616 from tobiasd/20220607-lng
DE, FR, HU, RU translation updates
2022-06-07 07:12:08 +02:00
Tobias Diekershoff 17877d9fd7
update FR translations THX kalon33 2022-06-07 06:32:01 +02:00
Tobias Diekershoff e3183cb4b4
DE translation updats 2022-06-07 06:31:52 +02:00
Tobias Diekershoff 579a23ba6e
RU translations THX Alexander An 2022-06-07 06:31:35 +02:00
Tobias Diekershoff 64fac441a6
HU translation update THX Balázs Úr 2022-06-07 06:31:13 +02:00
Hypolite Petovan 21d4726619
Merge pull request #11615 from annando/api-markers
API: Support for markers added
2022-06-06 18:00:00 -04:00
Michael 56e88d2c4c Fix the spelling 2022-06-06 21:52:47 +00:00
Michael 19772f29f3 API: Support for markers added 2022-06-06 21:38:59 +00:00
Hypolite Petovan 90eeacde3c
Merge pull request #11613 from annando/updated
Only update when new content arrives
2022-06-06 09:15:58 -04:00
Michael d435203f72 Merge remote-tracking branch 'upstream/2022.05-rc' into updated 2022-06-06 11:58:40 +00:00
Hypolite Petovan 9c7568cffc
Merge pull request #11612 from annando/rearrange
Rearrange the notification settings
2022-06-06 07:33:23 -04:00
Michael 069c1d0b35 Only update when new content arrives 2022-06-06 10:41:07 +00:00
Michael 9bb371850a Different approach for empty values 2022-06-06 07:35:28 +00:00
Michael a07e47f50c Improved handling with empty user configuration 2022-06-06 05:43:24 +00:00
Michael 62701b49e1 Use constants 2022-06-06 04:44:29 +00:00
Hypolite Petovan 3f711b5301
Merge pull request #11611 from annando/writable
Hopefully make threads writable
2022-06-05 21:31:49 -04:00
Michael da33517a2d Rearrange the notification settings 2022-06-05 21:19:21 +00:00
Michael 557b1125e2 Hopefully make threads writable 2022-06-05 20:38:05 +00:00
Tobias Diekershoff e5802b7c30
Merge pull request #11610 from annando/issue-11602
Issue 11602: Fix error during contact merhe
2022-06-05 20:27:47 +02:00
Michael 1196df4895 Remove test 2022-06-05 18:16:50 +00:00
Michael 001aac9952 Issue 11602: Fix error during contact merhe 2022-06-05 18:15:10 +00:00
Tobias Diekershoff 9e37435ae6
Merge pull request #11609 from annando/fix-uid
Fix notifications
2022-06-05 18:56:16 +02:00
Michael 9daeb552dd Suppress dislikes 2022-06-05 16:54:29 +00:00
Michael 24559b711b Notify about shared posts again 2022-06-05 16:26:20 +00:00
Michael d242332aa4 Add the notify type to the notification query 2022-06-05 15:02:03 +00:00
Hypolite Petovan 7c3dcc6f1d
Merge pull request #11608 from annando/fix-uid
Use the user id instead of "local_user()"
2022-06-05 10:38:23 -04:00
Michael 13e216032f Use the user id instead of "local_user()" 2022-06-05 14:22:16 +00:00
Hypolite Petovan 28ce00c102
Merge pull request #11606 from annando/issue-11566
Issue 11566: More detailled notification configuration
2022-06-05 08:13:34 -04:00
Michael Vogel 913f5ada27
Merge pull request #11603 from tobiasd/20220605-lng
DE, HU translation updates
2022-06-05 13:46:33 +02:00
Michael 57b8708425 Issue 11566: More detailled notification configuration 2022-06-05 11:41:08 +00:00
Tobias Diekershoff b6d2d71cbd
added HU translation THX Balázs Úr 2022-06-05 10:08:01 +02:00
Tobias Diekershoff c3024e5b92
DE translation updats 2022-06-05 10:07:44 +02:00
Hypolite Petovan b1afcb5ebf
Merge pull request #11588 from annando/mergecontact
New command to merge duplicated contacts
2022-06-04 15:34:37 -04:00
Tobias Diekershoff fd48a8c9ab
Merge pull request #11601 from annando/issue-11594
Issue 11594: Ensure to create notifications in the user language
2022-06-04 16:52:26 +02:00
Tobias Diekershoff 327b29d794
Merge pull request #11600 from annando/no-visible-photo
Don't make photo item visible
2022-06-04 16:51:21 +02:00
Michael f1913b28e0 Issue 11594: Ensure to create notifications in the user language 2022-06-04 14:08:11 +00:00
Michael db4ad7883f Revert some of the last changes 2022-06-04 12:11:41 +00:00
Michael 3b2c2e5d33 Don't make photo item visible 2022-06-04 12:02:59 +00:00
Tobias Diekershoff 7684cd4f07
Merge pull request #11599 from annando/avatar
Fix avatar for messages and feeds
2022-06-04 10:08:17 +02:00
Michael 50a0034744 Fix avatar for messages and feeds 2022-06-04 07:57:11 +00:00
Tobias Diekershoff 4a5d230aad
Merge pull request #11597 from annando/pinned-private
Fix: Only public posts can be pinned
2022-06-04 08:33:38 +02:00
Michael 4108704ee3 Fix: Only public posts can be pinned 2022-06-04 06:11:32 +00:00
Michael 194f0f7058 No dropping 2022-06-03 20:14:38 +00:00
Hypolite Petovan 6e3b5d251e
Merge pull request #11596 from annando/visible-activities
Fix: Like/Dislike/Reshare actions should now be visible
2022-06-03 15:54:49 -04:00
Michael 0aee9a054a Fix: Like/Dislike/Reshare actions should now be visible 2022-06-03 17:40:06 +00:00
Tobias Diekershoff 69c8bd3b5e
Merge pull request #11593 from annando/avatar-basepath
Ensure that the avatar base path exists
2022-06-03 15:04:21 +02:00
Michael 5442d09cc1 Ensure that the avatar base path exists 2022-06-03 05:28:10 +00:00
Philipp e4c13bb1c7
Merge pull request #11590 from tobiasd/20220602-lng
FR, RU translation updates
2022-06-02 08:37:07 +02:00
Tobias Diekershoff ec07a31fb3
update FR translations THX kalon33 2022-06-02 07:00:37 +02:00
Tobias Diekershoff 5d4aec176e
RU translations THX Alexander An 2022-06-02 07:00:22 +02:00
Michael b794c599a9 Standards fixed 2022-06-01 22:18:18 +00:00
Michael e46354a522 New command to merge duplicated contacts 2022-06-01 22:11:03 +00:00
Philipp aae735413e
Merge pull request #11587 from tobiasd/20220601-hu
HU translation updated THX Balázs Úr
2022-06-01 20:11:32 +02:00
Tobias Diekershoff 078334ce53
HU translation updated THX Balázs Úr 2022-06-01 18:43:36 +02:00
Philipp 514250073f
Merge pull request #11586 from tobiasd/20220601-de
DE translation updates
2022-06-01 11:46:35 +02:00
Tobias Diekershoff d67c4d1e91 it will be a 2022.06 release and some other things fixed 2022-06-01 08:25:21 +02:00
Tobias Diekershoff 8c4ec6adde
DE translation updates 2022-06-01 05:46:32 +02:00
Hypolite Petovan 749130b226
Merge pull request #11585 from annando/fix-display
Fix: Activities should be be able again on displayed posts
2022-05-31 18:09:52 -04:00
Michael 36b80eb704 We should now always fetch the user posts 2022-05-31 17:49:08 +00:00
Michael f4e680c97e Fix: Activities should be be able again on displayed posts 2022-05-31 17:00:21 +00:00
Tobias Diekershoff 8e09f6f579 another bug fixed 2022-05-31 16:32:41 +02:00
Tobias Diekershoff d6d826329f
Merge pull request #11584 from annando/follow-notification
Fix: Use correct follow notification texts
2022-05-31 16:30:59 +02:00
Michael 7b219718c4 Fix: Use correct follow notification texts 2022-05-31 14:02:43 +00:00
Tobias Diekershoff bce376ef6f small stuff in the last hours of the RC... 2022-05-31 08:17:21 +02:00
Tobias Diekershoff 78a0c98a11
Merge pull request #11583 from annando/photo-resolution
Fix: Show photos in high resolution
2022-05-31 07:10:25 +02:00
Michael 592665ed28 Fix: Show photos in high resolution 2022-05-31 04:52:50 +00:00
Hypolite Petovan 0a44143ef5
Merge pull request #11582 from annando/issue-10926
Issue 10926: Transmit pending events to accepted contacts
2022-05-30 22:37:50 -04:00
Michael cc6192df02 Issue 10926: Transmit pending events to accepted contacts 2022-05-30 20:52:43 +00:00
Tobias Diekershoff 94a178c590 numbers of closed issues updated, and some small additions 2022-05-30 17:08:56 +02:00
Michael Vogel 0b312ae9b3
Merge pull request #11580 from tobiasd/20220530-lng
DE, FR and HU translation updates
2022-05-30 16:24:25 +02:00
Tobias Diekershoff d7eb78e65e
DE translation updates 2022-05-30 16:04:07 +02:00
Tobias Diekershoff 6ec812208f
update FR translations THX kalon33 2022-05-30 16:04:00 +02:00
Tobias Diekershoff 406b3f14dd
HU translation updated THX Balázs Úr 2022-05-30 16:03:45 +02:00
Michael Vogel ee40d8ea04
Merge pull request #11579 from MrPetovan/bug/11291-user-theme-display
Assume unsettable system.always_my_theme pconfig value is always true
2022-05-29 23:27:21 +02:00
Hypolite Petovan 7f711e266f Assume unsettable system.always_my_theme pconfig value is always true
- This was a logged in user setting so it assumes false for anonymous users
2022-05-29 16:13:49 -04:00
Hypolite Petovan 9160fde8ca
Merge pull request #11578 from annando/issue-11561
Issue 11561: Don't mark photo links as invalid
2022-05-29 15:54:22 -04:00
Hypolite Petovan 220703575c
Merge pull request #11577 from annando/issue-11557
Issue 11557: Update all local contacts
2022-05-29 15:53:21 -04:00
Hypolite Petovan 1e68c90fb2
Merge pull request #11576 from annando/issue-11488
Issue 11488: Don't search for mentions in shared posts
2022-05-29 15:49:46 -04:00
Michael aabb56c70d Issue 11561: Don't mark photo links as invalid 2022-05-29 19:10:00 +00:00
Michael Vogel 47a3d8e6ce
Merge pull request #11519 from MrPetovan/task/11511-console-domain-move
Add relocate console command and fix the missing DB tables for the relocation
2022-05-29 20:42:32 +02:00
Hypolite Petovan 4c5d9e22a8 Propagate signature change of Database::transaction() 2022-05-29 14:23:57 -04:00
Hypolite Petovan 121d26999c Updated main translation file after moving strings 2022-05-29 13:58:33 -04:00
Michael 540b3f892b Issue 11557: Update all local contacts 2022-05-29 17:48:09 +00:00
Hypolite Petovan 1301a53f20 Remove relocation form from Admin Site settings 2022-05-29 13:15:23 -04:00
Hypolite Petovan f1630ebb05 Add relocate console command 2022-05-29 13:13:59 -04:00
Hypolite Petovan 7d09ce86c4 Move relocation feature in its separate class
- Create Database->replaceInTableFields method
2022-05-29 12:11:18 -04:00
Michael 42d3e5c1ce Issue 11488: Don't search for mentions in shared posts 2022-05-29 16:07:53 +00:00
Hypolite Petovan 697b8a6cb8
Merge pull request #11575 from annando/issue-11469
Issue 11469: Respect desktop notification settings
2022-05-29 08:06:32 -04:00
Michael 1dccc31508 Issue 11469: Repect desktop notification settings 2022-05-29 09:20:06 +00:00
Tobias Diekershoff 92bf5213cc
Merge pull request #11573 from annando/no-local
Don't touch local avatars
2022-05-29 10:10:40 +02:00
Michael 02473d8a0e Don't touch local avatars 2022-05-29 06:50:34 +00:00
Michael Vogel 511a51b9a3
Merge pull request #11571 from MrPetovan/bug/11291-user-theme-display
Use the top-level author theme if they're a local user in mod/display
2022-05-29 05:39:54 +02:00
Hypolite Petovan a924716131 Use the top-level author theme if they're a local user in mod/display 2022-05-28 21:53:57 -04:00
Hypolite Petovan faa3f26d3b
Merge pull request #11570 from annando/issue-11470
Issue 11470: Check for removed account
2022-05-28 18:32:21 -04:00
Hypolite Petovan a503d5ac1b
Merge pull request #11569 from annando/issue-11431
Issue 11431: Only show pinned posts on contacts and your own ones
2022-05-28 18:24:37 -04:00
Hypolite Petovan 875d84435c
Merge pull request #11568 from annando/add-timestamp
Add timestamp data to the avatar path
2022-05-28 18:21:19 -04:00
Michael 4ef7f42257 Issue 11470: Check for removed account 2022-05-28 16:21:41 +00:00
Michael 881c4204b4 Issue 11431: Only show pinned posts on contacts and your own ones 2022-05-28 15:55:31 +00:00
Michael ba8088bf3c Add timestamp data to the avatar path 2022-05-28 14:20:48 +00:00
Philipp c7608983dc
Merge pull request #11567 from tobiasd/20220528-hu
HU translation updated THX Balázs Úr
2022-05-28 09:45:25 +02:00
Tobias Diekershoff efa15ab0b8
HU translation updated THX Balázs Úr 2022-05-28 07:09:07 +02:00
Tobias Diekershoff d3624af1b6
Merge pull request #11565 from annando/force-avatar-update
Pass the "force" parameter to the avatar update
2022-05-27 09:52:10 +02:00
Michael b05aa824f7 Don't move mail and feed 2022-05-27 06:32:19 +00:00
Michael 0a43fe857c Pass the "force" parameter to the avatar update 2022-05-27 05:36:07 +00:00
Michael Vogel e793438e0d
Merge pull request #11564 from tobiasd/20220527-de
DE translation updates
2022-05-27 07:12:38 +02:00
Tobias Diekershoff cf91734f4f
DE translation updates 2022-05-27 07:08:48 +02:00
Hypolite Petovan d4631176b2
Merge pull request #11563 from annando/avatar-error
Issue-11560: Fix error when creating avatar cache file
2022-05-26 18:58:49 -04:00
Michael 4475b3ff39 Updated messages.po 2022-05-26 20:01:07 +00:00
Michael 8c901ebd74 Issue-11560: Fix error when creating avatar cache file 2022-05-26 19:06:16 +00:00
Hypolite Petovan 1d29025091
Merge pull request #11559 from tobiasd/20220526-lng
DE, RU, ZH CN translation updates
2022-05-26 10:24:54 -04:00
Tobias Diekershoff cb5b6f345e
update to the zh-cn translation THX shykana 2022-05-26 16:18:11 +02:00
Tobias Diekershoff 314431507d
RU translations THX Alexander An 2022-05-26 16:17:58 +02:00
Tobias Diekershoff 620352d1a2
DE translation updates 2022-05-26 16:17:29 +02:00
Tobias Diekershoff 5a1108352c added new console tool to the CHANGELOG 2022-05-25 17:28:08 +02:00
Tobias Diekershoff 5c9aa13147 some things added to the CHANGELOG 2022-05-25 17:28:08 +02:00
Tobias Diekershoff 1ed2b1af7a typo 2022-05-25 17:28:08 +02:00
Tobias Diekershoff dc13704dd4 CHANGELOG for the 2022.05 release 2022-05-25 17:28:08 +02:00
Hypolite Petovan 488fdd9791
Merge pull request #11558 from annando/public-contact
Ensure that the public contact exists before adding a user contact
2022-05-25 09:06:13 -04:00
Hypolite Petovan ae3acba231
Merge pull request #11549 from annando/move-to-avatar-cache
Console command to move avatars to the avatar cache
2022-05-25 09:03:12 -04:00
Hypolite Petovan 36ccb25bd2
Merge pull request #11556 from tobiasd/20220525-frhu
FR and HU translation updates
2022-05-25 09:02:27 -04:00
Michael 918c1eeb56 Check for phantom network 2022-05-25 11:46:58 +00:00
Michael f5d69b3b6a Ensure that the public contact exixts before adding a user contact 2022-05-25 11:43:29 +00:00
Michael e8864653d8 Merge remote-tracking branch 'upstream/2022.05-rc' into move-to-avatar-cache 2022-05-25 05:38:50 +00:00
Michael dadebdd061 Change output function 2022-05-25 05:24:31 +00:00
Tobias Diekershoff 737d9e7a58
HU translation updated THX Balázs Úr 2022-05-25 07:23:59 +02:00
Tobias Diekershoff 2a0ab3f0f1
update FR translations THX kalon33 2022-05-25 07:21:04 +02:00
Hypolite Petovan 9804c71b53
Merge pull request #11555 from annando/relay
Improved Relay handling / better handling of receiver responses
2022-05-25 00:22:42 -04:00
Hypolite Petovan 0de50a5118
Merge pull request #11554 from tobiasd/20220525-fr
update FR translations THX  kalon33
2022-05-25 00:20:37 -04:00
Michael Vogel e5e509ea21 Calculate totals 2022-05-24 22:32:30 +02:00
Michael 2fbfc0633a Fixed placeholder 2022-05-24 20:12:39 +00:00
Michael d3709d8497 Delete on invalid 2022-05-24 20:02:54 +00:00
Michael 9da0e637a3 Quit on invalid avatars 2022-05-24 19:47:49 +00:00
Michael 80adad3ad2 Additional method to fetch photo avatars 2022-05-24 19:41:38 +00:00
Michael fb0e31791f updated messages.po 2022-05-24 19:09:36 +00:00
Michael 077c6ece64 Don't use a newline at the end 2022-05-24 17:51:28 +00:00
Michael 2ead69c7a5 Delete invalid photo data 2022-05-24 17:49:29 +00:00
Michael Vogel 0374f0e523 Use correct placeholder 2022-05-24 19:45:02 +02:00
Michael 0ff8ca8053 Trim the rid 2022-05-24 17:39:02 +00:00
Michael Vogel eddfab7122 A space in front of a message looks better 2022-05-24 19:36:48 +02:00
Michael f764ab7429 Improved messages 2022-05-24 17:33:10 +00:00
Michael 74b102b948 Increase the delivery queue counter on drop 2022-05-24 17:28:35 +00:00
Michael bee6ffe968 Support dropping delivery for single message transfer as well 2022-05-24 12:32:04 +00:00
Michael 034d838248 Ignore delivery problems with drops 2022-05-24 12:27:35 +00:00
Michael 8969e83134 Use a better query to fetch the relay actor 2022-05-24 08:06:48 +00:00
Michael e68ff3b3bb Return the actor, not the array 2022-05-24 08:02:55 +00:00
Michael b1a2de5cb5 Resubscribe to relay servers 2022-05-24 07:02:42 +00:00
Michael f16cb13dc7 Fixwd class description 2022-05-24 05:58:14 +00:00
Tobias Diekershoff 9b860f4051
update FR translations THX kalon33 2022-05-24 07:51:23 +02:00
Michael 7b91c4f333 Sorting by "id asc" makes more sense. 2022-05-23 15:31:37 +00:00
Michael 68599c7efa Some more code beauty 2022-05-23 12:44:21 +00:00
Michael 299c4df8f4 Convert to tabs 2022-05-23 12:35:44 +00:00
Michael d658c81107 Code standards 2022-05-23 12:33:25 +00:00
Michael d6242aacf6 Console command to move avatars to the avatar cache 2022-05-23 12:15:30 +00:00
Tobias Diekershoff a1871756ee
Merge pull request #11546 from nupplaphil/bug/catch_image_exception
Fix unsupported animated webp parsing
2022-05-21 18:59:21 +02:00
Philipp 218fc0c20d
Fix unsupported animated webp parsing 2022-05-21 18:51:03 +02:00
Philipp 783b05cbb1
Fix unsupported animated webp parsing 2022-05-21 18:44:03 +02:00
Hypolite Petovan c4ec80e839
Merge pull request #11545 from annando/url-tag
Don't parse tags in links
2022-05-21 08:44:49 -04:00
Michael 087ad25c87 Escape the "share" as well 2022-05-21 11:55:38 +00:00
Michael 54d7a435a3 Don't parse tags in links 2022-05-21 11:46:38 +00:00
Tobias Diekershoff ed350e472f
Merge pull request #11544 from annando/image-proxy
Only use proxied image links with images
2022-05-21 13:40:46 +02:00
Michael 49dab14215 Only use proxied image links with images 2022-05-21 06:58:26 +00:00
Tobias Diekershoff 9e19043c15
Merge pull request #11543 from annando/warning
Avoid warning "Undefined namespace prefix"
2022-05-21 08:18:59 +02:00
Michael 3444c29b0b Avoid warning "Undefined namespace prefix" 2022-05-21 06:04:34 +00:00
Hypolite Petovan 11538376ed
Merge pull request #11539 from annando/worker-split
The worker and the delivery is split into several classes
2022-05-20 23:45:51 -04:00
Hypolite Petovan c374630c65
Merge pull request #11541 from annando/fix-relay
Only deliver own content to the relay (possibly fix relay problems)
2022-05-20 23:42:36 -04:00
Michael e4e8b8cb46 Restoring old status 2022-05-20 22:52:44 +00:00
Michael 5095ce621a Test the license check 2022-05-20 22:43:27 +00:00
Michael Vogel 7857c329cf Only deliver own content to the relay (possibly fix relay problems) 2022-05-20 19:04:03 +02:00
Michael 9ded39eff6 Renamed variable 2022-05-20 15:49:59 +00:00
Hypolite Petovan 8af0af5f35
Merge pull request #11540 from tobiasd/20220520-pl
PL translation update THX strebski
2022-05-20 10:54:07 -04:00
Tobias Diekershoff d858aa86e5
PL translation update THX strebski 2022-05-20 13:59:55 +02:00
Michael 2fc5957abb Spelling error fixed 2022-05-20 05:46:38 +00:00
Michael 653af77e5f Further formatting fixes 2022-05-20 04:52:18 +00:00
Michael 6ce23bd9ca Fixed code structure 2022-05-20 04:42:10 +00:00
Michael dc16e6d471 The worker is split into several classes 2022-05-19 19:24:21 +00:00
Philipp 87e14d9d28
Merge pull request #11533 from annando/notification-cache
Cache notifications
2022-05-19 20:32:30 +02:00
Michael Vogel a13d33e057
Merge pull request #11536 from tobiasd/20220519-de
DE translation updates
2022-05-19 14:11:44 +02:00
Tobias Diekershoff e151e5958f
DE translation updates 2022-05-19 12:49:27 +02:00
Michael 49c47008d1 Convert class calls into DI calls 2022-05-19 09:08:04 +00:00
Michael Vogel 0b8e0a09e3
Merge pull request #11534 from nupplaphil/bug/catch_notfound
Catch exceptions for Worker::AddContact()
2022-05-19 04:45:13 +02:00
Philipp c33611c484
Catch exceptions for Worker::AddContact() 2022-05-18 22:37:17 +02:00
Michael 5aa798b1dc Remove test logging 2022-05-18 20:10:14 +00:00
Michael 536ce232a7 Cache notifications 2022-05-18 20:05:29 +00:00
Tobias Diekershoff 7d958e8804
Merge pull request #11530 from annando/logruntime
Configuration for logging added
2022-05-18 08:17:50 +02:00
Tobias Diekershoff b18880221a
Merge pull request #11531 from annando/display-polls
Improved poll texts for different conditions
2022-05-18 08:16:41 +02:00
Tobias Diekershoff 23e5ae15e3
Merge pull request #11528 from annando/logruntime
Log the execution time
2022-05-18 07:07:55 +02:00
Michael 4622814e5f Configuration for logging added 2022-05-18 03:10:38 +00:00
Michael 2e6e3597e5 unused DI" removed 2022-05-18 02:19:45 +00:00
Michael f6167b4cfd New function to exit the program 2022-05-18 02:13:54 +00:00
Michael 4e9d7df31a Add missing DI 2022-05-17 21:26:35 +00:00
Michael aacaa3c2cf Log the command, not the module 2022-05-17 21:25:01 +00:00
Michael 4016a576d5 Log the execution time 2022-05-17 20:47:23 +00:00
Tobias Diekershoff 6eb70bea16
Merge pull request #11526 from annando/ap-endpoint-cache
Prolonged cache lifetime for endpoints
2022-05-17 17:43:20 +02:00
Michael 0b50dc363b Caching of "noscrape" 2022-05-17 15:39:04 +00:00
Michael c3fd8b39aa Caching for profiles removed 2022-05-17 12:53:31 +00:00
Michael 4e3e9dc763 Cache the profile as well 2022-05-17 12:46:55 +00:00
Michael 75534fa3f3 Fix warning " Trying to access array offset on value of type bool" 2022-05-17 12:38:39 +00:00
Michael 73019284ce Increase cache lifespan / clear cache upon changes 2022-05-17 12:32:25 +00:00
Michael a880d8b982 Merge remote-tracking branch 'upstream/2022.05-rc' into ap-endpoint-cache 2022-05-17 08:18:02 +00:00
Michael 610f8a086f Use cache key constants 2022-05-17 08:17:41 +00:00
Tobias Diekershoff 3493f91801
Merge pull request #11525 from annando/shared-media
Fix: Fetch media in shared posts
2022-05-17 10:11:21 +02:00
Michael 10cdefa232 Fix: Fetch media in shared posts 2022-05-17 07:58:41 +00:00
Tobias Diekershoff e555ea6aad
Merge pull request #11524 from annando/cache-endpoints
AP endpoints are now cached
2022-05-17 07:13:51 +02:00
Michael 1ccf22a496 AP endpoints are now cached 2022-05-17 04:58:54 +00:00
Tobias Diekershoff 9f1cc2fb67
Merge pull request #11523 from annando/preview
Fix: Preview failed because of unknown variables
2022-05-17 06:09:51 +02:00
Michael 3f8da997f4 Fix: Preview failed because of unknown variables 2022-05-17 03:40:38 +00:00
Hypolite Petovan 65516a1d3a
Merge pull request #11522 from annando/performance
Performance: Avoid queries where there is no media or category
2022-05-16 15:00:10 -04:00
Michael Vogel 257ae2ac17
Merge pull request #11521 from tobiasd/20220516-de
DE translation updates
2022-05-16 19:12:36 +02:00
Michael 4daae255d8 Performance: Avoid queries where there is no media or category 2022-05-16 17:06:58 +00:00
Tobias Diekershoff f07422634a
DE translation updates 2022-05-16 18:36:24 +02:00
Michael 62a1cf257e Improved poll texts for different conditions 2022-05-16 06:04:46 +00:00
Tobias Diekershoff 69984ac6bc
Merge pull request #11520 from annando/display-polls
Display poll results
2022-05-16 08:04:08 +02:00
Michael Vogel 7199a91289
Merge pull request #11509 from tobiasd/20220515-credits
regen CREDITS for the 2022.05 release
2022-05-16 07:32:31 +02:00
Michael 2dc9b4eda2 Vote text changed 2022-05-16 05:31:53 +00:00
Michael f277d9cd2f Exclude several folders from translation generation 2022-05-16 05:30:58 +00:00
Michael 1555c82196 Translation updated 2022-05-16 05:07:28 +00:00
Michael a63caefe3d Polls are now displayed 2022-05-16 04:55:15 +00:00
Hypolite Petovan 4829c240e9
Merge pull request #11516 from annando/issue-11472
Issue 11472: Store the "edit" history
2022-05-15 20:24:59 -04:00
Hypolite Petovan 2bde5c4850
Merge pull request #11518 from annando/issue-11504
Issue 11504: Abstract has to be plaintext
2022-05-15 20:19:42 -04:00
Michael 2c511b8a23 Check the edit date before storing history 2022-05-15 21:15:31 +00:00
Michael 440b6d7956 Issue 11504: Abstract has to be plaintext 2022-05-15 21:04:01 +00:00
Michael d77b043d9c Fixing tests 2022-05-15 20:26:14 +00:00
Michael 324cce7a19 Issue 11472: Store the "edit" history 2022-05-15 20:21:56 +00:00
Tobias Diekershoff 204e52ea30
Merge pull request #11515 from annando/issue-11492
Issue 11492: Improvements for contact import
2022-05-15 21:56:36 +02:00
Michael 972f91436c Issue 11492: Improvements for contact import 2022-05-15 18:40:46 +00:00
Tobias Diekershoff 6f70d21e07
Merge pull request #11514 from annando/issue-11508
Issue 11508: Sanitizing date fields for events and polls
2022-05-15 20:07:52 +02:00
Michael 5af7c30026 Issue 11508: Sanitizing date fields for events and polls 2022-05-15 18:00:19 +00:00
Tobias Diekershoff 66004f4d2d regen CREDITS for the 2022.05 release 2022-05-15 13:46:07 +02:00
Tobias Diekershoff 44291a465b
Merge pull request #11506 from annando/featured-worker
Fetch featured posts through a worker
2022-05-15 13:10:19 +02:00
Michael 30b9af10ac Fetch featured posts through a worker 2022-05-15 09:08:35 +00:00
Tobias Diekershoff 036b565a78
Merge pull request #11503 from annando/bulk-delivery
Fix workerqueue entries with wrong priority
2022-05-15 08:22:36 +02:00
Michael f0bfa9a690 Each 5xx error is a server fail 2022-05-14 13:49:01 +00:00
Michael 689b71c696 Added check for server failure 2022-05-14 11:34:00 +00:00
Michael fbdb73cdd6 Improved log levels 2022-05-14 11:18:48 +00:00
Michael 43dbd1c396 Add additional timeout checks 2022-05-14 11:09:59 +00:00
Michael f8d929d94e Ensure to set the network timeout 2022-05-14 09:53:12 +00:00
Michael 962b35a76a Merge remote-tracking branch 'upstream/2022.05-rc' into bulk-delivery 2022-05-14 07:44:25 +00:00
Michael a8839517fe Fix workerqueue entries with wrong priority 2022-05-14 06:36:43 +00:00
Michael 30bcb24af7 Display the runtime 2022-05-14 06:06:38 +00:00
Michael 4b5a743645 Handle timeout 2022-05-14 05:38:01 +00:00
Tobias Diekershoff 74167043a8
Merge pull request #11497 from annando/bulk-delivery
Simplifications for the experimental bulk delivery
2022-05-14 07:34:21 +02:00
Michael 4ef2679ca6 Fix test 2022-05-13 19:37:50 +00:00
Michael fab5ba39ff Failed post deliveries are now deleted via cron 2022-05-13 18:48:13 +00:00
Michael 065d73f860 Merge remote-tracking branch 'upstream/2022.05-rc' into bulk-delivery 2022-05-13 08:53:18 +00:00
Michael 65b86fe0d5 Blanks replaced 2022-05-13 07:44:36 +00:00
Michael 0f0f4bc2c7 New worker job for deliveries without a worker 2022-05-13 07:31:00 +00:00
Tobias Diekershoff bb44ff1528
Merge pull request #11500 from annando/pleroma-issues
Change the featured collection to fix communication issues with Pleroma
2022-05-13 07:58:49 +02:00
Michael a662245c74 We now store the receivers as well 2022-05-13 05:52:05 +00:00
Michael 47cd1edb9f Change the featured collection to fix communication issues with Pleroma 2022-05-13 03:42:04 +00:00
Michael Vogel 201610dfe6 Don't look at the command when archiving an inbox 2022-05-13 04:24:22 +02:00
Michael 2595b5e12f Remove all posts of a given inbox 2022-05-13 02:18:46 +00:00
Michael 2049fbce91 Remove delivery when the inbox is archived 2022-05-13 02:11:02 +00:00
Michael 4f68be82ef Use a simpler worker call 2022-05-12 21:28:57 +00:00
Michael 67a74c15e1 Improve item fetching 2022-05-12 21:10:59 +00:00
Michael Vogel 5409998047
Merge pull request #11498 from tobiasd/20220512-zhcn
update to the zh-cn translation THX gudzpoz
2022-05-12 19:24:36 +02:00
Michael b0b67f1fde Remove failing posts 2022-05-12 12:43:49 +00:00
Tobias Diekershoff dfeb2e9a62
update to the zh-cn translation THX gudzpoz 2022-05-12 14:29:05 +02:00
Tobias Diekershoff ce7bf8524d
update to the zh-cn translation THX gudzpoz 2022-05-12 14:27:03 +02:00
Michael a943dbb420 Introducing the "failed" counter 2022-05-12 06:54:58 +00:00
Michael d5d2892f59 Simplifications for the experimental bulk delivery 2022-05-12 06:17:55 +00:00
Hypolite Petovan f128c00ca5
Merge pull request #11496 from annando/no-local-update
Don't update the local avatar
2022-05-11 14:53:25 -04:00
Michael 3d7ecb4fde Don't update the local avatar 2022-05-11 18:30:59 +00:00
Hypolite Petovan 610b3fc39e
Merge pull request #11495 from annando/warning
Avoid warning "fileperms(): stat failed for ..."
2022-05-11 13:46:06 -04:00
Michael afa57edf8e Avoid warning "fileperms(): stat failed for ..." 2022-05-11 17:28:28 +00:00
Hypolite Petovan fc364df7c2
Merge pull request #11494 from annando/warning
Fix a warning because of an undefined array key
2022-05-11 12:08:07 -04:00
Michael 47ee6fd009 Fix a warning because of an undefined array key 2022-05-11 16:01:37 +00:00
Michael Vogel 449df1a583
Merge pull request #11493 from tobiasd/20220511-frioimportcontactsform
[frio] import contacts form was missing the enctype
2022-05-11 17:59:20 +02:00
Tobias Diekershoff d816f02ab8
[frio] import contacts form was missing the enctype
fixes #11492 hopefully

For uploading files, the enctype for the form has to be set to `multipart/form-data`. Frio was missing this specification, other themes inherit it from the default template.
2022-05-11 17:28:57 +02:00
Hypolite Petovan 7026dd37db
Merge pull request #11490 from annando/issue-11487
Move IDN conversion behind the cleaning
2022-05-11 08:52:02 -04:00
Michael 0f0b649e8d Replace unparse function 2022-05-11 11:06:14 +00:00
Michael 34f594137e Movwe the conversion after the cleaning 2022-05-11 10:56:44 +00:00
Michael ffb8491c3f Merge remote-tracking branch 'upstream/2022.05-rc' into issue-11487 2022-05-11 10:53:43 +00:00
Michael 020ba7a4ed The function is now usable for all formats 2022-05-11 06:58:26 +00:00
Michael 695e3d8b61 Simplifiy the split 2022-05-11 06:55:02 +00:00
Tobias Diekershoff b5129eb4ed
Merge pull request #11489 from annando/issue-11487
Issue 11487: IDN support added
2022-05-11 08:46:15 +02:00
Michael 47808ab0e9 Issue 11487: IDN support added 2022-05-11 06:34:25 +00:00
Hypolite Petovan e374c2e3da
Merge pull request #11486 from annando/avatar-fixes
Fix local avatar, improve speed for fetching cached photos
2022-05-10 14:41:06 -04:00
Michael d9de8b6d2f Remove test logging 2022-05-10 18:37:02 +00:00
Michael fae414fedd Fix local avatar, improve speed for fetching cached photos 2022-05-10 18:18:24 +00:00
Hypolite Petovan 776ce3f63a
Merge pull request #11484 from annando/avatar-logging
Improved logging for avatar storing
2022-05-10 08:03:31 -04:00
Tobias Diekershoff 4be52cdc4e
Merge pull request #11485 from annando/endless-loop
Avoid endless loop when storing posts
2022-05-10 08:44:39 +02:00
Michael 7c3173a0ae Avoid endless loop when storing posts 2022-05-10 06:07:26 +00:00
Michael 945f5c6db2 Improved logging for avatar storing 2022-05-10 06:04:37 +00:00
Hypolite Petovan d195d934be
Merge pull request #11482 from annando/inherit-permissions
Inherit avatar cache file permissions
2022-05-09 23:15:47 -04:00
Michael 22da88b43f Changed log level 2022-05-10 01:14:27 +00:00
Michael 548bf469ca Added logging 2022-05-09 22:36:25 +00:00
Hypolite Petovan c50ca418a5
Merge pull request #11483 from annando/issue-11353
Issue 11353: Suppress the forum sharer
2022-05-09 17:54:31 -04:00
Michael 630d25a24b Issue 11353: Suppress the forum sharer 2022-05-09 20:52:08 +00:00
Michael 34030a736d Use a constant for the avatar base path 2022-05-09 19:16:14 +00:00
Michael 916aa1c9a9 Inherit avatar cache file permissions 2022-05-09 17:36:46 +00:00
Hypolite Petovan e1f32f7f15
Merge pull request #11477 from annando/avatar-file-cache
Cache contact avatars locally as files
2022-05-09 11:13:08 -04:00
Michael cbe4a42906 Use a warning instead 2022-05-09 14:36:41 +00:00
Michael f785026289 Don't return a filename when it wasn't stored 2022-05-09 08:47:02 +00:00
Michael f744dd362d Picture shouldn't be executable 2022-05-09 08:28:23 +00:00
Michael 9d1ff0a4ce Set permissions 2022-05-09 08:20:09 +00:00
Michael 006b7a95f0 More avatar handling isolation 2022-05-09 06:57:47 +00:00
Michael 681d19a3bc Standards and renamed class 2022-05-09 06:31:09 +00:00
Michael 53d064c283 Avatar handling is moved to a separate class 2022-05-09 06:27:46 +00:00
Michael e3692c0105 Replaced check with hardwired path 2022-05-09 04:26:00 +00:00
Hypolite Petovan b9e091eb2f
Merge pull request #11480 from annando/gotosocial
GoToSocial added to the federation admin page
2022-05-08 16:40:32 -04:00
Michael Vogel 6b9f543c4e GoToSocial added to the federation admin page 2022-05-08 20:50:11 +02:00
Michael f220e26f00 Use new function to check for a local avatar cache file 2022-05-08 10:32:29 +00:00
Michael 805dc8e6bd Fix config call 2022-05-08 09:34:30 +00:00
Michael dd422a1e03 Fix contact field name 2022-05-08 08:57:41 +00:00
Michael 7b0187c4c5 Don't overwrite already replaced cache file paths 2022-05-08 08:53:18 +00:00
Michael Vogel ee81c266e1
Merge pull request #11476 from MrPetovan/bug/11445-abstract-code
Escape BBCode tag parsing avoidance tags when processing abstracts
2022-05-08 08:02:41 +02:00
Michael 2d856f48b7 Use the default timeout 2022-05-08 05:51:18 +00:00
Michael a31256412e Cache contact avatars locally as files 2022-05-08 05:37:17 +00:00
Hypolite Petovan 510dacf4df Escape BBCode tag parsing avoidance tags when processing abstracts
- Improve documentation for related methods
2022-05-07 22:19:50 -04:00
Hypolite Petovan 25876099ce Add tests for BBCode::getAbstract and BBCode::stripAbstract methods 2022-05-07 22:19:50 -04:00
Tobias Diekershoff 166f38ef3b
Merge pull request #11474 from annando/issue-11440
Issue 11440: Hashtags are now generated again
2022-05-07 09:31:13 +02:00
Michael 67c3a20c4f Issue 11440: Hashtags are now generated again 2022-05-06 17:03:51 +00:00
Hypolite Petovan 4729fca5d9
Merge pull request #11457 from annando/performance
Improve page performance
2022-05-06 11:11:05 -04:00
Michael Vogel 1e7a55180a
Update src/Content/Conversation.php
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2022-05-05 22:40:20 +02:00
Michael 2433fee461 Changes after code review 2022-05-05 12:23:44 +00:00
Michael ab42fd88a4 Changed index for the categories 2022-05-05 08:45:32 +00:00
Michael 2a4b5b4cb4 New index 2022-05-05 08:40:50 +00:00
Michael 4d359b7de1 Move the plink functionality to the right function 2022-05-05 07:57:52 +00:00
Michael d34432c517 Ignore if the worker was added 2022-05-05 06:12:16 +00:00
Michael 2f74a7bca4 Update display cache when the post had been edited 2022-05-04 07:50:14 +00:00
Michael 10b453bfc2 Deprecated function removed 2022-05-04 07:49:37 +00:00
Michael 60532ee7e4 Fill the item cache when storing item 2022-05-04 06:17:34 +00:00
Michael f6218427a4 Use the uri-id to fetch the contact 2022-05-03 21:51:56 +00:00
Tobias Diekershoff ff8e839139
Merge pull request #11468 from urbalazs/urbalazs-da-dk
Add Danish language to list of native language names
2022-05-03 21:26:47 +02:00
Balázs Úr 4171ff7563
Add Danish language to list of native language names 2022-05-03 21:13:47 +02:00
Michael Vogel 9953abb8aa
Merge pull request #11467 from tobiasd/20220503-de
DE translation updates
2022-05-03 18:13:18 +02:00
Tobias Diekershoff a7237ac036
DE translation updates 2022-05-03 15:25:09 +02:00
Michael fdf8002df1 Update database.sql 2022-05-03 08:26:38 +00: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
Tobias Diekershoff 8bf806c550
pump version to 2022.05-rc 2022-05-03 07:24:19 +02: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 c608d85707 Updated database description 2022-05-02 05:17:42 +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
Tobias Diekershoff f8b75ad1cc
Merge pull request #11466 from atjn/contribute
Add CONTRIBUTING note
2022-05-01 19:51:49 +02:00
atjn e7bfe0bf31 Add CONTRIBUTING note 2022-05-01 16:19:05 +02:00
Hypolite Petovan 51854754b6
Merge pull request #11462 from ErichBSchulz/patch-1
Update Install.md
2022-05-01 08:09:55 -04:00
Erich c938eb5002
Update doc/Install.md
fix by @MrPetovan

Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2022-05-01 22:09:00 +10:00
Hypolite Petovan 196a381a52
Merge pull request #11463 from tobiasd/20220501-lng
DA DK translation added, HU PL and RU translations updated
2022-05-01 08:06:17 -04:00
Hypolite Petovan 6dc13b9fc6
Merge pull request #11460 from tobiasd/20220429-issue10397
[frio] adding Feed link to vcard
2022-05-01 07:45:14 -04: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
Tobias Diekershoff 815b76db8b
DA DK translation added THX atjn 2022-05-01 10:33:47 +02:00
Tobias Diekershoff 37ddda7fc2
HU translation updated THX Balázs Úr 2022-05-01 10:31:44 +02:00
Tobias Diekershoff 245fe3dade
RU translations THX Alexander An 2022-05-01 10:31:32 +02:00
Tobias Diekershoff da68774e91
PL translation update THX strebski 2022-05-01 10:31:15 +02: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
Erich d255c3128e
Update Install.md
include instructions for db config
2022-05-01 15:01:13 +10: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
Tobias Diekershoff 7ce6fd19b5
adding style information for the Feed link 2022-04-29 19:33:26 +02:00
Tobias Diekershoff 6161485b2f
[frio] adding Feed link to vcard
This PR adds a link to the Atom Feed of a profile to the aside vcard in the Frio theme. The link is already in the other themes, so it only needs to be added to Frio.

fixes #10397
2022-04-29 19:27:25 +02:00
Michael fdf70c1047 Make post preview workable 2022-04-29 12:34:10 +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
Anton 51380af100
Fix img example
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2022-04-28 18:13:38 +02:00
Anton 748b7528d3
Fix img example
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2022-04-28 18:13:16 +02:00
Hypolite Petovan 55db2670d1
Merge pull request #11452 from atjn/manifest-icons
Update app manifest icons
2022-04-28 10:25:22 -04: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
Hypolite Petovan dc05172272
Merge pull request #11448 from annando/api-documentation
Some small API documentation rearrangements
2022-04-27 10:36:22 -04:00
Hypolite Petovan 5a08bca15b
Merge pull request #11447 from annando/contacts-posts
Fix: Show reshared posts on the contact page
2022-04-27 10:35:24 -04:00
Michael 0ad18afb7b Some small API documentation rearrangements 2022-04-27 06:50:25 +00:00
Michael 144c9f00f4 Fix: Show reshared posts on the contact page 2022-04-27 03:25:47 +00:00
Hypolite Petovan 973257ae13
Merge pull request #11446 from annando/directory
Use central function to fetch the global directory
2022-04-26 14:38:14 -04:00
Michael 171354181d Use central function to fetch the global directory 2022-04-26 18:33:58 +00:00
Hypolite Petovan 478ee7b6fc
Merge pull request #11443 from annando/endpoints
We now store uncommon endpoints
2022-04-25 11:53:17 -04: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
Hypolite Petovan f4c073674e
Merge pull request #11439 from annando/unused-tags
Removed unused tag entries
2022-04-24 21:25:32 -04:00
Michael 069a008ca4 Removed unused tag entries 2022-04-24 15:27:20 +00:00
Hypolite Petovan 7bc449215f Updated main translation file after moving module 2022-04-24 08:36:57 -04: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
Hypolite Petovan 904ee0ea59
Merge pull request #11436 from annando/tag-type
Store the tag type for the post targets
2022-04-23 21:12:55 -04:00
Michael ac08bc1362 Enhanced database comment 2022-04-24 00:20:06 +00:00
Michael f7142f0144 Updated messages.po 2022-04-23 12:45:26 +00: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
Hypolite Petovan 1c0c787d1c
Merge pull request #11435 from annando/api-poll
API: We can now display polls
2022-04-22 16:24:14 -04:00
Michael 9b646dad97 API: We can now display polls 2022-04-22 19:24:22 +00:00
Hypolite Petovan ee05bd91a3
Merge pull request #11433 from annando/api-unsupported
API: New Mastodon endpoints added
2022-04-21 19:49:11 -04:00
Michael f34b7b91fa API: New Mastodon endpoints added 2022-04-21 19:58:56 +00:00
Hypolite Petovan 45c4af3832
Merge pull request #11430 from annando/network-order
Order starred posts and posts with mention by the last comment date
2022-04-21 10:46:22 -04: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
Tobias Diekershoff 691136c396
Merge pull request #11429 from annando/issue-11427
Issue 11427: id values of OrderedCollections have to contain the page number
2022-04-21 06:58:25 +02:00
Michael eb1f38df22 Issue 11427: id values of OrderedCollections have to contain the page number 2022-04-21 04:29:08 +00:00
Hypolite Petovan 70392df68d
Merge pull request #11428 from annando/issue-11425
Issue 11425: Additional sorting by creation date
2022-04-20 19:25:32 -04:00
Michael 2236e5cfb0 Issue 11425: Additional sorting by creation date 2022-04-20 21:03:33 +00:00
Hypolite Petovan e1a8f8aff6
Merge pull request #11426 from annando/notice
Avoid warning " Undefined variable $browsershare"
2022-04-20 09:40:49 -04:00
Michael 94a8f430e3 Avoid warning " Undefined variable $browsershare" 2022-04-20 12:03:09 +00:00
Hypolite Petovan 333863684a
Merge pull request #11424 from annando/store-question
We can now store incoming questions
2022-04-20 08:01:35 -04: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
Hypolite Petovan 8dbd1d0e52
Merge pull request #11423 from annando/share-via
Renamed "share" with "share via"
2022-04-19 17:26:26 -04:00
Michael 62b31900a6 Renamed "share" with "share via" 2022-04-19 21:04:55 +00:00
Hypolite Petovan 75f49a41af
Merge pull request #11421 from foss-/develop
Update FAQ: Remove Roma iOS and Husky Android, both EOL
2022-04-19 11:16:56 -04:00
Philipp 6617b6c088
Merge pull request #11422 from annando/language
Fix: The language detection only searched for farsi
2022-04-19 10:26:04 +02:00
Michael 0380a3e216 Fix: The language detection only searched for farsi 2022-04-19 06:16:44 +00:00
foss- ea148050dc
re-added Husky
- new developer for husky, re-added entry with F-Droid und Google Play links
2022-04-18 22:34:04 +02:00
foss- ec5905aee2
Update FAQ: Remove Roma iOS and Husky Android, both EOL
- Roma iOS entry removed
- Husky Android entry removed
2022-04-18 19:05:26 +02:00
Hypolite Petovan 60afca1fea
Merge pull request #11420 from thomasrockhu-codecov/patch-1
Add informational Codecov status checks
2022-04-18 10:43:42 -04:00
Hypolite Petovan d2d368781d
Merge pull request #11418 from foss-/patch-1
Update FAQ.md
2022-04-18 10:37:15 -04:00
Tom Hu 51fe7876d1
Update .codecov.yml 2022-04-18 10:11:56 -04:00
Tom Hu 065e379198
Add informational Codecov status checks
Hi, Tom from Codecov here. I noticed that you were using Codecov but weren't actually getting any notifications on pull requests. I figured it would be useful to get some idea if code being changed is being tested, but also not blocking CI/merging. Let me know if this makes sense or if we can do something that would be helpful.
2022-04-18 10:01:09 -04:00
foss- c796f854f2
Update FAQ.md
- Mastonaut for macOS is now free, removed cost info and added close source info
- updated name for Mastodon client
- added Whalebird for Windows
- added Mastodon for Android
- removed Dica (last update Jan 2019, developer website, source code github and support forum link on Google Play site dead)
- added Tusky F-Droid and Google Play links
- removed twitlatte (This app was suspended by Twitter. Please use other app. as per repo info)
- Yuito added Google Play link
- Twidere X added F-Droid and Google Play links
- removed Roma (App will be removed from app store on 3/15/2021 and support ended, as per Google Play info)
- removed website links for tooot and b4x ios, twidere android for consistency - app name ideally always goes to source
2022-04-18 13:50:32 +02:00
Philipp 9f58141dad
Merge pull request #11417 from annando/fix-webfinger
Fix: Webfinger returned xml when json has been requested and vice versa
2022-04-18 10:00:19 +02: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
Philipp a2a5f27d76
Merge pull request #11412 from annando/fix-compose
Fixes notice
2022-04-15 12:15:08 +02: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
Tobias Diekershoff e4682a522e
Merge pull request #11411 from annando/creation-date
Experimental feature to enter a custom creation date
2022-04-13 07:47:44 +02:00
Michael 0d8cf06e4a Experimental feature to enter a custom creation date 2022-04-13 05:31:32 +00:00
Tobias Diekershoff d5f0829cad
Merge pull request #11409 from annando/server-detect
Avoid wrong server type detection / Owncast added
2022-04-12 07:47:18 +02:00
Michael 30e5ef928a Avoid wrong server type detection / Owncast added 2022-04-12 05:34:34 +00:00
Hypolite Petovan 8720561e49
Merge pull request #11408 from annando/notices
Fix several notices
2022-04-11 15:54:48 -04: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
Hypolite Petovan ba1bdc6920
Merge pull request #11400 from annando/display-featured
Display featured posts for contacts
2022-04-08 08:03:07 -04: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
Hypolite Petovan 2024d45971
Merge pull request #11398 from tobiasd/20220407-pl
PL translation update THX strebski
2022-04-07 00:33:31 -04:00
Tobias Diekershoff 32aea615e6
PL translation update THX strebski 2022-04-07 06:31:28 +02:00
Hypolite Petovan f4aa8236c4
Merge pull request #11397 from bkil/doc/themes-link
doc/themes.md,FAQ-admin: point to live friendica-themes.com mirror
2022-04-06 22:51:51 -04:00
bkil 72a3ab6382 doc/themes.md,FAQ-admin: point to live friendica-themes.com mirror 2022-04-07 02:36:05 +02:00
Hypolite Petovan 8669f12176
Merge pull request #11396 from annando/issue-11393
Issue 11393: Fix failing preview
2022-04-06 12:36:10 -04:00
Michael 65071ffc9e Issue 11393: Fix failing preview 2022-04-06 16:26:51 +00:00
Hypolite Petovan 9339d4e53b
Merge pull request #11395 from annando/featured2
Preparations for "featured" posts
2022-04-06 11:58:28 -04:00
Michael 5a3fe900f0 Fix test 2022-04-06 15:32:14 +00:00
Michael 612e91b603 Added description 2022-04-06 15:02:21 +00:00
Michael a1dd299eb3 Preparations for "featured" posts 2022-04-06 13:34:11 +00:00
Hypolite Petovan 29f65d250f
Merge pull request #11394 from annando/is-blocked
Added processing of incoming block notices
2022-04-05 19:14:03 -04: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
Hypolite Petovan 79526564ca
Merge pull request #11392 from annando/new-acitivities
Store all known incoming actitivies
2022-04-05 08:41:37 -04: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
Hypolite Petovan 8ab477320a
Merge pull request #11390 from annando/plink
Only use and accept valid http links as links to an external resource
2022-04-04 10:58:37 -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 Vogel c700645385
Merge pull request #11387 from tobiasd/20220402-pl
PL translation update THX strebski
2022-04-02 13:36:31 +02:00
Tobias Diekershoff 3faa4142c1
PL translation update THX strebski 2022-04-02 13:25:40 +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
Hypolite Petovan e9a6c4a7e3
Merge pull request #11384 from annando/tusky-upload
API: Enable picture upload via Tusky again
2022-03-30 16:41:59 -04:00
Michael 5d497f9962 API: Enable picture upload via Tusky again 2022-03-30 20:33:46 +00:00
Philipp db60557a4f
Merge pull request #11382 from annando/accept-2
Some more "accept" parameters are added
2022-03-30 17:14:17 +02: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
Tobias Diekershoff 173e72169b
Merge pull request #11381 from annando/friendica-actor
Avoid returning of the actor when requesting friendica/json
2022-03-28 15:38:03 +02:00
Michael 51b2bf6f70 Avoid returning of the actor when requesting friendica/json 2022-03-28 13:12:45 +00:00
Hypolite Petovan 797db32992
Merge pull request #11379 from annando/accept
Constants for "expect" added and used
2022-03-28 08:46:02 -04:00
Michael ff70f74952 "accept" constants introduced and used 2022-03-28 10:33:06 +00:00
Michael 4f2d659d42 Merge remote-tracking branch 'upstream/develop' into develop 2022-03-27 19:43:08 +00:00
Hypolite Petovan e09e1b2336
Merge pull request #11378 from nupplaphil/feat/accept
Add Default Accept for HTTP Calls
2022-03-27 13:09:20 -04:00
Philipp 80a533ddab
Add Default Accept for HTTP Calls 2022-03-26 22:15:44 +01:00
Michael Vogel c396e3099e
Merge pull request #11377 from tobiasd/20220325-pl
PL translation update THX strebski
2022-03-25 08:17:49 +01:00
Tobias Diekershoff 7bea941f3c
PL translation update THX strebski 2022-03-25 07:01:20 +01:00
Michael 0e6dcaebcc Merge branch 'develop' of github.com:annando/friendica into develop 2022-03-24 12:38:07 +00: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 7aec520b32 Don't display Peertube groups as forums 2022-03-24 11:29:50 +00:00
Tobias Diekershoff 1f0d828cd9
Merge pull request #11375 from annando/lemmy
Improve the compatibility with Lemmy
2022-03-24 12:13:13 +01:00
Michael 212eba327b Improve the compatibility with Lemmy 2022-03-24 10:57:55 +00:00
Michael Vogel aa1ef0516d
Merge pull request #11374 from MrPetovan/bug/11371-settings-autocomplete
Prevent unwarranted password manager auto-completion in settings form fields
2022-03-24 05:39:49 +01:00
Hypolite Petovan 719f47932d Prevent unwarranted password manager auto-completion in settings form fields 2022-03-23 19:43:25 -04:00
Hypolite Petovan ad1d11487e
Merge pull request #11373 from tobiasd/20220323-pl
PL translation update THX strebski
2022-03-23 15:15:54 -04:00
Tobias Diekershoff ab60cf0572
PL translation update THX strebski 2022-03-23 20:12:47 +01:00
Hypolite Petovan 4b2cc546f1
Merge pull request #11372 from annando/issue-11368
Issue 11368: Prevent namespace prefix warning
2022-03-22 18:16:24 -04:00
Michael 6f43821ebf Issue 11368: Prevent namespace prefix warning 2022-03-22 21:07:35 +00:00
Hypolite Petovan 709e9dcf9c
Merge pull request #11370 from tobiasd/20220322-pl
PL translation update THX strebski
2022-03-22 14:47:41 -04:00
Tobias Diekershoff 5cb83900ff
PL translation update THX strebski 2022-03-22 19:28:23 +01: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
Hypolite Petovan 56d0a33286
Merge pull request #11367 from annando/title-cq
Prioritize the title over the summary (content warning)
2022-03-22 08:53:48 -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 bbb4ffb7a0 Merge remote-tracking branch 'upstream/develop' into title-cq 2022-03-22 07:05:03 +00:00
Michael be016b0c45 Prioritize the title over the content warning 2022-03-22 07:00:44 +00:00
Hypolite Petovan 5a4018a05b
Merge pull request #11366 from annando/pinned
Issue 11310: Show pinned posts when not logged in
2022-03-21 19:14:42 -04:00
Michael a2a5f05a19 Issue 11310: Show pinned posts when not logged in 2022-03-21 22:58:23 +00:00
Hypolite Petovan 7c282c597d
Merge pull request #11364 from friendica/notification-links
Fix link to post in notification
2022-03-20 19:59:41 -04:00
Michael 7959bc1e63 Updated messages.po 2022-03-20 20:21:35 +00:00
Michael 4dace46159 Fix link to post in notification 2022-03-20 19:59:35 +00:00
Tobias Diekershoff 09e55c15e4
Merge pull request #11363 from annando/api-route
API: Adds missing route for "conversation/show/id"
2022-03-20 13:37:14 +01:00
Michael 85fce09b1a API: Adds missing route for "conversation/show/id" 2022-03-20 12:06:39 +00:00
Philipp 75a7ff9b11
Merge pull request #11362 from tobiasd/20220320-de
DE translation updates
2022-03-20 08:32:22 +01:00
Tobias Diekershoff f66020e767
DE translation updates 2022-03-20 07:53:31 +01: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 Vogel fcad961e57
Merge pull request #11358 from tobiasd/20220319-ru
RU translations THX Alexander An
2022-03-19 16:30:34 +01:00
Michael fb6a435a6a Avoid empty notifications / fixed link to the content 2022-03-19 15:25:00 +00:00
Tobias Diekershoff 111d42ce8f
RU translations THX Alexander An 2022-03-19 16:07:50 +01:00
Hypolite Petovan a4a24e06a5
Merge pull request #11357 from annando/fetch-usage
Improve the description of the federation statistics
2022-03-19 10:46:29 -04:00
Michael f9369141a4 Updated messages.po 2022-03-19 11:26:49 +00:00
Michael 351e9a307c Fixed placeholder 2022-03-19 11:24:09 +00:00
Michael 3f15a20e4a Updated messages.po 2022-03-19 11:21:51 +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 Vogel 677cbf8aea
Merge pull request #11354 from MrPetovan/bug/notices
Check array key existence in ActivityPub\Transmitter::createPermissionBlockForItem
2022-03-19 10:56:25 +01: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
Hypolite Petovan 61e023d448
Merge pull request #11334 from annando/guid-style
Use a nicer GUID style format
2022-03-18 07:30:34 -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
Michael Vogel 5c3226d88e
Merge pull request #11352 from MrPetovan/task/4639-soapbox-intro-notification
Add support for notification visibility settings
2022-03-17 06:33:10 +01:00
Hypolite Petovan 04ac4841f9 Add support for notification visibility settings 2022-03-16 22:03:26 -04:00
Hypolite Petovan 6818c8e69a
Merge pull request #11347 from annando/post-update
Fix the problem that the post update never stopped on larger systems
2022-03-16 22:02:37 -04:00
Michael 0b10806ce3 Fix the problem that the post update never stopped on larger systems 2022-03-16 22:00:34 -04:00
Hypolite Petovan 2703fd50fc
Merge pull request #11351 from tobiasd/20220316-11350
.htaccess-dist deny access to some backup files
2022-03-16 14:56:18 -04:00
Tobias Diekershoff 77cb9405be
only deny files ending in ~ 2022-03-16 19:54:43 +01:00
Tobias Diekershoff cd7b9177ea
.htaccess-dist deny access to some backup files
this PR adds a filematch block to the distributed .htaccess file to deny access to backup files from emacs (~), vim (.swp) and other backup files (.bak).

addressing #11350
2022-03-16 19:35:59 +01: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
Michael Vogel 72c31c060d
Merge pull request #11349 from tobiasd/20220316-de
DE translation updates
2022-03-16 09:29:44 +01:00
Tobias Diekershoff 69dc90ffd1
DE translation updates 2022-03-16 07:34:29 +01:00
Michael Vogel ef8dce89b6
Merge pull request #11348 from tobiasd/20220316-typo
fixing a typo
2022-03-16 06:42:52 +01:00
Tobias Diekershoff 8d3bef8e63
regen messages.po 2022-03-16 06:27:23 +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
Tobias Diekershoff 79772214ad
Merge pull request #11342 from MrPetovan/task/4639-soapbox-intro-notification
Add correct ordering for detailed notifications
2022-03-15 12:28:24 +01:00
Hypolite Petovan a07f840c74 Add correct ordering for detailed notifications 2022-03-15 07:05:59 -04:00
Michael Vogel a30b553c28
Merge pull request #11341 from tobiasd/20220315-getcontactstoupdate
PHP deprecation warning due wrong order of function parameters
2022-03-15 09:06:43 +01: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 634c785d4b Update main translation file after string changes 2022-03-14 22:56:46 -04: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 Vogel 1138abe923
Merge pull request #11273 from MrPetovan/task/4639-soapbox-intro-notification
Add follow notifications for soapbox accounts
2022-03-14 22:53:57 +01:00
Michael 7940b31685 Don't use the GUID value directly 2022-03-14 21:09:14 +00:00
Hypolite Petovan ee60c96269 Updated main translation file after string changes 2022-03-14 08:02:45 -04: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 b002f6f027 Remove unused deprecated XML output in mod/ping
- Remove unused parameters localUser and uid in mod/ping
- Unify data array initialization in mod/ping
2022-03-14 07:57:00 -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
Tobias Diekershoff b98243826f
Merge pull request #11332 from annando/receivers2
Don't send forum posts to the user's followers
2022-03-14 09:41:42 +01:00
Michael 0956d1dd64 Don't send forum posts to the user's followers 2022-03-14 06:07:51 +00:00
Tobias Diekershoff 5a4b97b0e6
Merge pull request #11331 from annando/forum-receivers
Send community posts only to the community
2022-03-14 06:43:43 +01:00
Michael 2642996171 Send community posts only to the community 2022-03-13 19:31:21 +00:00
Hypolite Petovan 7da13cf335
Merge pull request #11330 from annando/feed-stuff
Some small improvements for importing feeds
2022-03-13 11:47:49 -04:00
Michael ca086b880b Some small improvements for importing feeds 2022-03-13 15:29:07 +00:00
Michael Vogel 4eba3c0126
Merge pull request #11327 from tobiasd/20220313-de
DE translation updates
2022-03-13 09:49:30 +01:00
Tobias Diekershoff 5db3e02bbd
Merge pull request #11326 from annando/notifications
Don't send notifications for activities caused by the community contact
2022-03-13 08:14:28 +01:00
Tobias Diekershoff 3194c5d89f
DE translation updates 2022-03-13 08:12:35 +01: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
Hypolite Petovan 6a9c2173fb
Merge pull request #11322 from annando/community-notification
Reduce amount of notifications by communities
2022-03-11 23:59:50 -05:00
Michael 073a6afaaf Reduce amount of notifications by communities 2022-03-12 04:20:19 +00:00
Hypolite Petovan f9ad561a26 Updated translation file after changing a string 2022-03-11 23:14:24 -05:00
Hypolite Petovan d15ebb6fd3 Normalize base URL usage in admin templates 2022-03-11 23:14:21 -05:00
Hypolite Petovan 0c4f1eadb8
Merge pull request #11318 from annando/issue-11315
Issue 11315: Fix for all receivers in "to"
2022-03-11 15:52:42 -05:00
Michael 5eb647585d Issue 11315: Fix for all receivers in "to" 2022-03-11 20:39:03 +00:00
Hypolite Petovan 1b74ead75c
Merge pull request #11316 from annando/issue-11309
Issue 11309: Check if a post is wanted
2022-03-11 09:50:49 -05:00
Michael f264923cad Issue 11309: Check if a post is wanted 2022-03-11 14:00:05 +00:00
Hypolite Petovan e3025c2c15
Merge pull request #11314 from annando/server-estimate-usage
Estimate active server users when not provided by the system
2022-03-10 18:25:30 -05:00
Michael 2f97d61a09 Estimate active server users when not provided by the system 2022-03-10 21:50:00 +00:00
Hypolite Petovan e9df177055
Merge pull request #11312 from annando/permissions
Show permissions for all posts when possible
2022-03-10 06:06:36 -05:00
Michael 03d38d9e35 Show permissions for all posts when possible 2022-03-10 07:38:12 +00:00
Hypolite Petovan c81eb78e38
Merge pull request #11308 from annando/api-bookmark
API: Fixed the bookmarking
2022-03-08 17:42:05 -05: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
Hypolite Petovan 82e25a7cf7
Merge pull request #11304 from annando/type-hints
Type hints reverted
2022-03-08 15:36:43 -05: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 8cf843abc3
Merge pull request #11302 from tobiasd/20220308-pl
PL translation update THX strebski
2022-03-08 10:48:27 -05:00
Tobias Diekershoff 8cfbe9b49b
PL translation update THX strebski 2022-03-08 16:19:38 +01:00
Tobias Diekershoff 4b6bbe3632 added empty 2022.05 block to the CHANGELOG 2022-03-07 14:12:07 +01:00
Tobias Diekershoff 79bc863831 bump Friendica version to 2022.05-dev again 2022-03-07 14:10:57 +01: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
705 changed files with 94446 additions and 52274 deletions

View File

@ -8,7 +8,11 @@ coverage:
round: down
range: "70...100"
status:
project: false
patch: false
project:
default:
informational: true
patch:
default:
informational: true
comment: false

12
.gitignore vendored
View File

@ -86,3 +86,15 @@ venv/
#Ignore cache file
.php_cs.cache
#ignore avatar picture cache path
/avatar
#Ignore autotest results
autotest-results.xml
#ignore phpunit result cache
tests/.phpunit.result.cache
#ignore .php_cs (local copy)
.php_cs

View File

@ -6,6 +6,7 @@ AddType application/x-java-archive .jar
AddType audio/ogg .oga
#AddHandler php53-cgi .php
# deny access to log files (friendica.log or php.out)
<FilesMatch "\.(out|log)$">
<IfModule authz_host_module>
#Apache 2.4
@ -17,6 +18,18 @@ AddType audio/ogg .oga
</IfModule>
</FilesMatch>
# deny access to backup files
<FilesMatch "(\~|\.bak|\.swp)$">
<IfModule authz_host_module>
#Apache 2.4
Require all denied
</IfModule>
<IfModule !authz_host_module>
#Apache 2.2
Deny from all
</IfModule>
</FilesMatch>
<IfModule mod_rewrite.c>
RewriteEngine on
# Protect repository directory from browsing

View File

@ -1,15 +1,13 @@
matrix:
include:
- PHP_MAJOR_VERSION: 7.4
PHP_VERSION: 7.4.18
depends_on:
- phpunit
- code_standards_check
- database_checks
- messages.po_check
platform: releaser/release # This prevents executing this pipeline at other servers than ci.friendi.ca
# This prevents executing this pipeline at other servers than ci.friendi.ca
labels:
location: friendica
type: releaser
skip_clone: true
@ -30,7 +28,7 @@ pipeline:
settings:
backend: "filesystem"
restore: true
cache_key: "{{ .Repo.Name }}_php${PHP_MAJOR_VERSION}_{{ arch }}_{{ os }}"
cache_key: "{{ .Repo.Name }}_php7.4_{{ arch }}_{{ os }}"
archive_format: "gzip"
mount:
- '.composer'
@ -41,7 +39,7 @@ pipeline:
branch: [ develop, '*-rc' ]
event: push
composer_install:
image: friendicaci/php${PHP_MAJOR_VERSION}:php${PHP_VERSION}
image: friendicaci/php7.4:php7.4.18
commands:
- export COMPOSER_HOME=.composer
- composer validate
@ -92,37 +90,12 @@ pipeline:
repo: friendica/friendica
branch: [ develop, '*-rc' ]
event: push
upload_artifacts:
publish_artifacts:
image: alpine
secrets:
- source: sftp_host
target: lftp_host
- source: sftp_user
target: lftp_user
- source: ssh_key
target: lftp_key
environment:
LFTP_PORT: "22"
LFTP_SOURCE: "build"
LFTP_TARGET: "/http"
volumes:
- /etc/hosts:/etc/hosts
commands:
- apk add lftp openssh openssl
- touch drone.key
- chmod 400 drone.key
- echo "$LFTP_KEY" | openssl base64 -A -d > drone.key
- lftp -c "
set net:timeout 5;
set net:max-retries 2;
set net:reconnect-interval-base 5;
set sftp:auto-confirm true;
set sftp:connect-program 'ssh -q -a -x -i drone.key';
connect sftp://$LFTP_USER:@$LFTP_HOST:$LFTP_PORT;
cd $LFTP_TARGET;
mput $LFTP_SOURCE/*;
"
- rm drone.key
- cp -fr build/* /tmp/friendica_files/
volumes:
- files:/tmp/friendica_files
when:
repo: friendica/friendica
branch: [ develop, '*-rc' ]

View File

@ -1,13 +1,11 @@
matrix:
include:
- PHP_MAJOR_VERSION: 7.4
PHP_VERSION: 7.4.18
depends_on:
- phpunit
- code_standards_check
platform: releaser/release # This prevents executing this pipeline at other servers than ci.friendi.ca
# This prevents executing this pipeline at other servers than ci.friendi.ca
labels:
location: friendica
type: releaser
skip_clone: true
@ -28,7 +26,7 @@ pipeline:
settings:
backend: "filesystem"
restore: true
cache_key: "{{ .Repo.Name }}_php${PHP_MAJOR_VERSION}_{{ arch }}_{{ os }}"
cache_key: "{{ .Repo.Name }}_php7.4_{{ arch }}_{{ os }}"
archive_format: "gzip"
mount:
- '.composer'
@ -39,7 +37,7 @@ pipeline:
branch: stable
event: tag
composer_install:
image: friendicaci/php${PHP_MAJOR_VERSION}:php${PHP_VERSION}
image: friendicaci/php7.4:php7.4.18
commands:
- export COMPOSER_HOME=.composer
- composer validate
@ -90,37 +88,12 @@ pipeline:
repo: friendica/friendica
branch: stable
event: tag
upload_artifacts:
publish_artifacts:
image: alpine
secrets:
- source: sftp_host
target: lftp_host
- source: sftp_user
target: lftp_user
- source: ssh_key
target: lftp_key
environment:
LFTP_PORT: "22"
LFTP_SOURCE: "build"
LFTP_TARGET: "/http"
volumes:
- /etc/hosts:/etc/hosts
commands:
- apk add lftp openssh openssl
- touch drone.key
- chmod 400 drone.key
- echo "$LFTP_KEY" | openssl base64 -A -d > drone.key
- lftp -c "
set net:timeout 5;
set net:max-retries 2;
set net:reconnect-interval-base 5;
set sftp:auto-confirm true;
set sftp:connect-program 'ssh -q -a -x -i drone.key';
connect sftp://$LFTP_USER:@$LFTP_HOST:$LFTP_PORT;
cd $LFTP_TARGET;
mput $LFTP_SOURCE/*;
"
- rm drone.key
- cp -fr build/* /tmp/friendica_files/
volumes:
- files:/tmp/friendica_files
when:
repo: friendica/friendica
branch: stable

107
CHANGELOG
View File

@ -1,3 +1,110 @@
Version 2022.10 (2022-10-14)
Friendica Core
Added GD translation, updates to the translations AR, DE, FR, HU, PL, SV, ZH CN
Added a check for too long passwords (due Blowfish hashing algorithm) [MrPetovan]
Added an API endpoint to create events [MrPetovan, pankraz]
Added the possibility to store profile avatars in a separate directory [annando]
Added an option to not fetch parent postings [annando]
Added an option to reject postings by language received by the relay [annando]
Added a notification mail to all users when the server block list is updated [MrPetovan]
Added a download link to the CSV file of the server block list on the about page [MrPetovan]
Added support for youtube short URLs [annando]
Updates to the themes (frio, smoothly) [AlessandroLorenzi, HankG, MrPetovan, tobiasd]
General code cleanup [annando, fabrixxm, Quix0r, tobiasd]
Enhanced the performance (cache, database, rendering) [annando, Quix0r]
Enhanced the language detection [annando]
Enhanced the display of the reason why a posting is shown to a user [annando]
Enhanced the fetching of missing postings [annando]
Enhanced the server detection [annando]
Enhanced the UI for 2FA logins [nupplaphil]
Enhanced the Woodpecker integration [nupplaphil]
Enhanced integration with ejabberd [nupplaphil]
Fixed a federation problem with Diaspora* during the author signature check [annando]
Fixed a problem with Forwarded-For headers [nupplaphil]
Fixed a problem with the encoding of mails send [MrPetovan]
Fixed a problem with weird formatted date notations [annando, MrPetovan]
Fixed a problem following some RSS feeds [mexon]
Fixed a problem with quoted reshares from Twitter [annando]
Updated dependencies [MrPetovan]
Replace SFTP-publish with docker-publish [nupplaphil]
Removed the poke functionality [MrPetovan]
Friendica Addons
Added GD translation, updates to the translation AR, FR
Removed the addons: morechoice, morepokes
Marked the addon whindowsphonepush as unsupported
twitter:
Valid post body can be empty [MrPetovan]
Support of Twitter threads was added [annando]
Closed Issues
11177, 11317, 11458, 11471, 11566, 11614, 11625, 11635, 11636, 11638,
11651, 11661, 11666, 11695, 11700, 11704, 11706, 11708, 11712, 11716,
11722, 11723, 11724, 11726, 11731, 11732, 11751, 11765, 11775, 11778,
11779, 11794, 11798, 11799, 11800, 11824, 11826, 11851, 11861, 11870,
11909, 11920, 11931, 11938, 11943, 11952, 11953, 11969, 11975
Version 2022.06 (2022-06-11)
Friendica Core
Added DA DK translation, updates to the translations DE, FR, HU, PL, RU, ZH CN [translation teams]
Updates to the documentation [foss-]
General code cleanup [annando, MrPetovan, nupplaphil, tobiasd]
Added caching for several AP endpoints [annando]
Added the display of pinned/featured postings of contacts [annando]
Added the display of polls and current votes [annando]
Added node relocation to the console tool [MrPetovan]
Added tool to move avatars to the avatar cache [annando]
Added storage of edit history of postings [annando]
Added the possibility to set custom posting dates [annando]
Added the possibility that pending events in a forum are send to new members [annando]
Removed node relocation functionality from the Admin Panel [MrPetovan]
Enhanced performance (database related, global directory) [annando]
Enhanced the logging [annando]
Enhanced the federation statistics page in the admin panel [annando]
Enhanced the Mastodon compatible API [annando]
Enhanced the .htaccess-dist file to prevent accessing some common backup files [tobiasd]
Enhanced the priority values of some worker queue jobs [annando]
Enhanced the possibility for the user selecting which notifications should be shown [MrPetovan]
Enhanced the relay server handling [annando]
Enhanced the users control what they are notified about [annando]
Changed the default icons to the flat icons [atjn]
Changed the order of starred posts and posts with mention by the last comment date [annando]
Fixed a problem with the local cache of contact avatars [annando]
Fixed a problem in the federation with Lemmy nodes [annando]
Fixed a problem importing some RSS feeds [annando]
Fixed a problem fetching attached media files [annando]
Fixed a problem with the abstract being formatted [annando]
Fixed a problem preventing the import of contacts [tobiasd]
Fixed a problem with IDN URLs [annando]
Fixed a problem parsing abstract BBCode tags [MrPetovan]
Fixed a problem that could cause unintentionally changing the password by password managers [MrPetovan]
Fixed a problem with the language detection of postings [annando]
Fixed a problem with the selection of JSON/XML webfinger results [annando]
Fixed a problem with re-shared postings that were pinned [annando]
Fixed a problem that caused the display of a wrong information about a new follower for some account types [annando]
Fixed a problem that caused interaction abilities on postings not to be possible [annando]
Fixed a problem causing links to larger photos lead to smaller ones [annando]
Fixed a regression that caused pinned private notes to be shown publically [annando]
Fixed a problem during the language detection for notifications [annando]
Friendica Addons
Breaking: The obsolete hooks settings_form and settings_post have been removed,
custom addons developers should use the addon_settings hook instead.
Updates to the translations DA DK, FR, HU, PL [translation teams]
advancedcontentfilter
Use a random item to validate fields on rule save [MrPetovan]
twitter
Fix usage of unfollow / block hooks [MrPetovan]
S3 storage back-end
Added the addon [nupplaphil]
Closed Issues
4639, 9650, 10926, 11040, 11146, 11212, 11223, 11226, 11291, 11299,
11309, 11310, 11315, 11319, 11338, 11339, 11340, 11343, 11350, 11353,
11371, 11393, 11407, 11425, 11427, 11431, 11440, 11445, 11450, 11461,
11469, 11470, 11487, 11488, 11491, 11492, 11504, 11507, 11508, 11510,
11511, 11512, 11557, 11560, 11561, 11594, 11602, 11625
Version 2022.03 (2022-03-07)
Friendica Core
Updates to the translations AR, DE, HU [translation teams]

5
CONTRIBUTING.md Normal file
View File

@ -0,0 +1,5 @@
# How to Contribute
If you want to contribute to the project, you dont need to have coding experience. There are a number of tasks listed in the issue tracker with the label “[Junior Jobs](https://github.com/friendica/friendica/issues?q=is%3Aopen+is%3Aissue+label%3A%22Junior+Jobs%22)” we think are good for new contributors. But you are by no means limited to these if you find a solution to a problem (even a new one) please make a pull request at [github](https://github.com/friendica/friendica) or let us know in the [development forum](https://forum.friendi.ca/profile/developers).
Contribution to Friendica is also not limited to coding. Any contribution to the [documentation](https://github.com/friendica/friendica/tree/develop/doc), the [translation](https://www.transifex.com/Friendica/friendica/dashboard/) or advertisement materials is welcome or reporting a problem. You dont need to deal with Git(Hub) or Transifex if you dont like to. Just [get in touch](https://forum.friendi.ca/profile/helpers) with us and we will get the materials to the appropriate places.

View File

@ -10,6 +10,7 @@ Aditoo
AgnesElisa
Albert
Aleksandr "M.O.Z.G" Dikov
Alessandro Lorenzi
Alex
Alexander An
Alexander Fortin
@ -28,9 +29,11 @@ Andy
Andy Hee
Angristan
Anthronaut
Anton
Antron Samurai
Arian - Cazare Muncitori
Asher Pen
atjn
aweiher
axelt
balderino
@ -55,6 +58,7 @@ Carlos Solís
Carsten Pfeiffer
Casper
Cat Gray
chinnux
Chris Case
Christian González
Christian Kalkhoff
@ -63,6 +67,7 @@ Christian Vogeley
Christian Wiwie
Cohan Robinson
Colby Sollars
Copiis
Copiis Praeesse
CrystalStiletto
Cyboulette
@ -90,6 +95,7 @@ effex7
Elena
emilia.krawczyk
Eric Côté
Erich
erik
Erkan Yilmaz
Eugene Veresk
@ -113,8 +119,10 @@ Gidi Kroon
GLComo
greeneyedred
Gregory Smith
gudzpoz
guzzisti
Haakon Meland Eriksen
Hank Grabowski
Hans Meine
Hauke
Hauke Altmann
@ -138,6 +146,7 @@ Joe Doe
joe slam
Johannes Schwab
John Brazil
John Mortensen
Jonatan Nyberg
Jonny Tischbein
Josef Moravek
@ -193,6 +202,7 @@ mpanhans
mytbk
nathilia-peirce
Nicola Spanti
Nicolas Derive
nobody
nupplaPhil
Olaf Conradi
@ -202,6 +212,7 @@ Olivier Mehani
Olivier Migeot
ominds
ozero dien
pankraz
Paolo Wave
Pascal
Pascal Deklerck
@ -216,6 +227,7 @@ Philipp Holzer
Pierre Bernardeau
Pierre Rudloff
Piotr Blonkowski
Piotr Strębski
pokerazor
R C
Rabuzarus
@ -284,6 +296,7 @@ Tobias Diekershoff
Tobias Hößl
Tom
Tom Aurlund
Tom Hu
tomamplius
tomtom84
Tony Baldwin
@ -302,6 +315,7 @@ Valvin
Vasudev Kamath
Vasya Novikov
very-ape
Viktor Nilsson
Vinzenz Vietzke
vislav
vladimir N
@ -310,8 +324,10 @@ VVelox
Vít Šesták 'v6ak'
Waldemar Stoczkowski
Walter Bulbazor
Wanting Chen
Wil Tur
Wouter Broers
Xiaofei Xu
XMPPはいいぞ
Yasen Pramatarov
Yasmine A

View File

@ -1,7 +1,7 @@
INPUT = README.md index.php boot.php update.php bin/ mod/ include/ view/ src/ VERSION
RECURSIVE = YES
PROJECT_NAME = "Friendica"
PROJECT_LOGO = images/friendica-64.jpg
PROJECT_LOGO = images/friendica-64.png
EXCLUDE = .htconfig.php config/ library/ doc/ .git/ log/ addon/ report/ privacy_image_cache/ photo/ proxy/ local/
EXCLUDE_PATTERNS = *smarty3* strings.php *.log *.out *test*
OUTPUT_DIRECTORY = doc

View File

@ -1 +1 @@
2022.03
2022.10

Binary file not shown.

View File

@ -18,13 +18,15 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*
*/
/**
* Run the worker from a daemon.
*
* This script was taken from http://php.net/manual/en/function.pcntl-fork.php
*/
if (php_sapi_name() !== 'cli') {
header($_SERVER["SERVER_PROTOCOL"] . ' 403 Forbidden');
header($_SERVER['SERVER_PROTOCOL'] . ' 403 Forbidden');
exit();
}
@ -43,13 +45,13 @@ $longopts = ['foreground'];
$options = getopt($shortopts, $longopts);
// Ensure that daemon.php is executed from the base path of the installation
if (!file_exists("boot.php") && (sizeof($_SERVER["argv"]) != 0)) {
$directory = dirname($_SERVER["argv"][0]);
if (!file_exists('boot.php') && (sizeof($_SERVER['argv']) != 0)) {
$directory = dirname($_SERVER['argv'][0]);
if (substr($directory, 0, 1) != "/") {
$directory = $_SERVER["PWD"] . "/" . $directory;
if (substr($directory, 0, 1) != '/') {
$directory = $_SERVER['PWD'] . '/' . $directory;
}
$directory = realpath($directory . "/..");
$directory = realpath($directory . '/..');
chdir($directory);
}
@ -84,16 +86,16 @@ TXT
$pidfile = DI::config()->get('system', 'pidfile');
if (in_array("start", $_SERVER["argv"])) {
$mode = "start";
if (in_array('start', $_SERVER['argv'])) {
$mode = 'start';
}
if (in_array("stop", $_SERVER["argv"])) {
$mode = "stop";
if (in_array('stop', $_SERVER['argv'])) {
$mode = 'stop';
}
if (in_array("status", $_SERVER["argv"])) {
$mode = "status";
if (in_array('status', $_SERVER['argv'])) {
$mode = 'status';
}
$foreground = array_key_exists('f', $options) || array_key_exists('foreground', $options);
@ -102,7 +104,7 @@ if (!isset($mode)) {
die("Please use either 'start', 'stop' or 'status'.\n");
}
if (empty($_SERVER["argv"][0])) {
if (empty($_SERVER['argv'][0])) {
die("Unexpected script behaviour. This message should never occur.\n");
}
@ -112,12 +114,12 @@ if (is_readable($pidfile)) {
$pid = intval(file_get_contents($pidfile));
}
if (empty($pid) && in_array($mode, ["stop", "status"])) {
if (empty($pid) && in_array($mode, ['stop', 'status'])) {
DI::config()->set('system', 'worker_daemon_mode', false);
die("Pidfile wasn't found. Is the daemon running?\n");
}
if ($mode == "status") {
if ($mode == 'status') {
if (posix_kill($pid, 0)) {
die("Daemon process $pid is running.\n");
}
@ -128,12 +130,12 @@ if ($mode == "status") {
die("Daemon process $pid isn't running.\n");
}
if ($mode == "stop") {
if ($mode == 'stop') {
posix_kill($pid, SIGTERM);
unlink($pidfile);
Logger::notice("Worker daemon process was killed", ["pid" => $pid]);
Logger::notice('Worker daemon process was killed', ['pid' => $pid]);
DI::config()->set('system', 'worker_daemon_mode', false);
die("Worker daemon process $pid was killed.\n");
@ -143,7 +145,7 @@ if (!empty($pid) && posix_kill($pid, 0)) {
die("Daemon process $pid is already running.\n");
}
Logger::notice('Starting worker daemon.', ["pid" => $pid]);
Logger::notice('Starting worker daemon.', ['pid' => $pid]);
if (!$foreground) {
echo "Starting worker daemon.\n";
@ -192,7 +194,7 @@ $last_cron = 0;
// Now running as a daemon.
while (true) {
if (!$do_cron && ($last_cron + $wait_interval) < time()) {
Logger::info('Forcing cron worker call.', ["pid" => $pid]);
Logger::info('Forcing cron worker call.', ['pid' => $pid]);
$do_cron = true;
}
@ -212,7 +214,7 @@ while (true) {
}
$start = time();
Logger::info("Sleeping", ["pid" => $pid, 'until' => gmdate(DateTimeFormat::MYSQL, $start + $wait_interval)]);
Logger::info('Sleeping', ['pid' => $pid, 'until' => gmdate(DateTimeFormat::MYSQL, $start + $wait_interval)]);
do {
$seconds = (time() - $start);
@ -230,14 +232,14 @@ while (true) {
}
$timeout = ($seconds >= $wait_interval);
} while (!$timeout && !Worker::IPCJobsExists());
} while (!$timeout && !Worker\IPC::JobsExists());
if ($timeout) {
$do_cron = true;
Logger::info("Woke up after $wait_interval seconds.", ["pid" => $pid, 'sleep' => $wait_interval]);
Logger::info('Woke up after $wait_interval seconds.', ['pid' => $pid, 'sleep' => $wait_interval]);
} else {
$do_cron = false;
Logger::info("Worker jobs are calling to be forked.", ["pid" => $pid]);
Logger::info('Worker jobs are calling to be forked.', ['pid' => $pid]);
}
}

View File

@ -15,33 +15,34 @@
# - TEST_SELECTION= ... Specify which tests are used to run (based on the test-labeling)
# - XDEBUG_CONFIG= ... Set some XDEBUG specific environment settings for development
DATABASENAME=${MYSQL_DATABASE:-test}
DATABASEUSER=${MYSQL_USERNAME:-friendica}
DATABASEHOST=${MYSQL_HOST:-localhost}
BASEDIR=$PWD
DATABASE_NAME=${FRIENDICA_MYSQL_DATABASE:-test}
DATABASE_USER=${FRIENDICA_MYSQL_USERNAME:-friendica}
DATABASE_HOST=${FRIENDICA_MYSQL_HOST:-localhost}
DATABASE_PASSWORD=${FRIENDICA_MYSQL_PASSWORD:-friendica}
BASEDIR=${PWD}
DBCONFIGS="mysql mariadb"
TESTS="REDIS MEMCACHE MEMCACHED APCU NODB"
export MYSQL_DATABASE="$DATABASENAME"
export MYSQL_USERNAME="$DATABASEUSER"
export MYSQL_PASSWORD="friendica"
export MYSQL_DATABASE="${DATABASE_NAME}"
export MYSQL_USERNAME="${DATABASE_USER}"
export MYSQL_PASSWORD="${DATABASE_PASSWORD}"
if [ -z "$PHP_EXE" ]; then
if [ -z "${PHP_EXE}" ]; then
PHP_EXE=php
fi
PHP=$(which "$PHP_EXE")
PHP=$(which "${PHP_EXE}")
# Use the Friendica internal composer
COMPOSER="$BASEDIR/bin/composer.phar"
COMPOSER="${BASEDIR}/bin/composer.phar"
set -e
_XDEBUG_CONFIG=$XDEBUG_CONFIG
_XDEBUG_CONFIG=${XDEBUG_CONFIG}
unset XDEBUG_CONFIG
function show_syntax() {
echo -e "Syntax: ./autotest.sh [dbconfigname] [testfile]\n" >&2
echo -e "\t\"dbconfigname\" can be one of: $DBCONFIGS" >&2
echo -e "\t\"dbconfigname\" can be one of: ${DBCONFIGS}" >&2
echo -e "\t\"testfile\" is the name of a test file, for example lib/template.php" >&2
echo -e "\nDatabase environment variables:\n" >&2
echo -e "\t\"MYSQL_HOST\" Mysql Hostname (Default: localhost)" >&2
@ -57,22 +58,22 @@ function show_syntax() {
echo -e "\nIf no arguments are specified, all tests will be run with all database configs" >&2
}
if [ -x "$PHP" ]; then
echo "Using PHP executable $PHP"
if [ -x "${PHP}" ]; then
echo "Using PHP executable ${PHP}"
else
echo "Could not find PHP executable $PHP_EXE" >&2
echo "Could not find PHP executable ${PHP_EXE}" >&2
exit 3
fi
echo "Installing depdendencies"
$PHP "$COMPOSER" install
${PHP} "$COMPOSER" install
PHPUNIT="$BASEDIR/vendor/bin/phpunit"
PHPUNIT="${BASEDIR}/vendor/bin/phpunit"
if [ -x "$PHPUNIT" ]; then
echo "Using PHPUnit executable $PHPUNIT"
if [ -x "${PHPUNIT}" ]; then
echo "Using PHPUnit executable ${PHPUNIT}"
else
echo "Could not find PHPUnit executable after composer $PHPUNIT" >&2
echo "Could not find PHPUnit executable after composer ${PHPUNIT}" >&2
exit 3
fi
@ -83,8 +84,8 @@ fi
if [ "$1" ]; then
FOUND=0
for DBCONFIG in $DBCONFIGS; do
if [ "$1" = "$DBCONFIG" ]; then
for DBCONFIG in ${DBCONFIGS}; do
if [ "$1" = "${DBCONFIG}" ]; then
FOUND=1
break
fi
@ -103,13 +104,13 @@ fi
function cleanup_config() {
if [ -n "$DOCKER_CONTAINER_ID" ]; then
echo "Kill the docker $DOCKER_CONTAINER_ID"
docker stop "$DOCKER_CONTAINER_ID"
docker rm -f "$DOCKER_CONTAINER_ID"
if [ -n "${DOCKER_CONTAINER_ID}" ]; then
echo "Kill the docker ${DOCKER_CONTAINER_ID}"
docker stop "${DOCKER_CONTAINER_ID}"
docker rm -f "${DOCKER_CONTAINER_ID}"
fi
cd "$BASEDIR"
cd "${BASEDIR}"
# Restore existing config
if [ -f config/local.config-autotest-backup.php ]; then
@ -122,77 +123,77 @@ trap cleanup_config EXIT
function execute_tests() {
DB=$1
echo "Setup environment for $DB testing ..."
echo "Setup environment for ${DB} testing ..."
# back to root folder
cd "$BASEDIR"
cd "${BASEDIR}"
# backup current config
if [ -f config/local.config.php ]; then
mv config/local.config.php config/local.config-autotest-backup.php
fi
if [ -z "$NOINSTALL" ]; then
if [ -z "${NOINSTALL}" ]; then
#drop database
if [ "$DB" == "mysql" ]; then
if [ -n "$USEDOCKER" ]; then
if [ "${DB}" == "mysql" ]; then
if [ -n "${USEDOCKER}" ]; then
echo "Fire up the mysql docker"
DOCKER_CONTAINER_ID=$(docker run \
-e MYSQL_ROOT_PASSWORD=friendica \
-e MYSQL_USER="$DATABASEUSER" \
-e MYSQL_USER="${DATABASE_USER}" \
-e MYSQL_PASSWORD=friendica \
-e MYSQL_DATABASE="$DATABASENAME" \
-e MYSQL_DATABASE="${DATABASE_NAME}" \
-d mysql)
DATABASEHOST=$(docker inspect --format="{{.NetworkSettings.IPAddress}}" "$DOCKER_CONTAINER_ID")
DATABASE_HOST=$(docker inspect --format="{{.NetworkSettings.IPAddress}}" "${DOCKER_CONTAINER_ID}")
else
if [ -z "$DRONE" ]; then # no need to drop the DB when we are on CI
if [ -z "${DRONE}" ]; then # no need to drop the DB when we are on CI
if [ "mysql" != "$(mysql --version | grep -o mysql)" ]; then
echo "Your mysql binary is not provided by mysql"
echo "To use the docker container set the USEDOCKER environment variable"
exit 3
fi
mysql -u "$DATABASEUSER" -pfriendica -e "DROP DATABASE IF EXISTS $DATABASENAME" -h $DATABASEHOST || true
mysql -u "$DATABASEUSER" -pfriendica -e "CREATE DATABASE $DATABASENAME DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci" -h $DATABASEHOST
mysql -u "${DATABASE_USER}" -pfriendica -e "DROP DATABASE IF EXISTS ${DATABASE_NAME}" -h ${DATABASE_HOST} || true
mysql -u "${DATABASE_USER}" -pfriendica -e "CREATE DATABASE ${DATABASE_NAME} DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci" -h ${DATABASE_HOST}
else
DATABASEHOST=mysql
DATABASE_HOST=mysql
fi
fi
echo "Waiting for MySQL $DATABASEHOST initialization..."
if ! bin/wait-for-connection $DATABASEHOST 3306 300; then
echo "Waiting for MySQL ${DATABASE_HOST} initialization..."
if ! bin/wait-for-connection ${DATABASE_HOST} 3306 300; then
echo "[ERROR] Waited 300 seconds, no response" >&2
exit 1
fi
echo "MySQL is up."
fi
if [ "$DB" == "mariadb" ]; then
if [ -n "$USEDOCKER" ]; then
if [ "${DB}" == "mariadb" ]; then
if [ -n "${USEDOCKER}" ]; then
echo "Fire up the mariadb docker"
DOCKER_CONTAINER_ID=$(docker run \
-e MYSQL_ROOT_PASSWORD=friendica \
-e MYSQL_USER="$DATABASEUSER" \
-e MYSQL_USER="${DATABASE_USER}" \
-e MYSQL_PASSWORD=friendica \
-e MYSQL_DATABASE="$DATABASENAME" \
-e MYSQL_DATABASE="${DATABASE_NAME}" \
-d mariadb)
DATABASEHOST=$(docker inspect --format="{{.NetworkSettings.IPAddress}}" "$DOCKER_CONTAINER_ID")
DATABASE_HOST=$(docker inspect --format="{{.NetworkSettings.IPAddress}}" "${DOCKER_CONTAINER_ID}")
else
if [ -z "$DRONE" ]; then # no need to drop the DB when we are on CI
if [ -z "${DRONE}" ]; then # no need to drop the DB when we are on CI
if [ "MariaDB" != "$(mysql --version | grep -o MariaDB)" ]; then
echo "Your mysql binary is not provided by mysql"
echo "To use the docker container set the USEDOCKER environment variable"
exit 3
fi
mysql -u "$DATABASEUSER" -pfriendica -e "DROP DATABASE IF EXISTS $DATABASENAME" -h $DATABASEHOST || true
mysql -u "$DATABASEUSER" -pfriendica -e "CREATE DATABASE $DATABASENAME DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci" -h $DATABASEHOST
mysql -u "${DATABASE_USER}" -pfriendica -e "DROP DATABASE IF EXISTS ${DATABASE_NAME}" -h ${DATABASE_HOST} || true
mysql -u "${DATABASE_USER}" -pfriendica -e "CREATE DATABASE ${DATABASE_NAME} DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci" -h ${DATABASE_HOST}
else
DATABASEHOST=mariadb
DATABASE_HOST=mariadb
fi
fi
echo "Waiting for MariaDB $DATABASEHOST initialization..."
if ! bin/wait-for-connection $DATABASEHOST 3306 300; then
echo "Waiting for MariaDB ${DATABASE_HOST} initialization..."
if ! bin/wait-for-connection ${DATABASE_HOST} 3306 300; then
echo "[ERROR] Waited 300 seconds, no response" >&2
exit 1
fi
@ -200,28 +201,28 @@ function execute_tests() {
echo "MariaDB is up."
fi
if [ -n "$USEDOCKER" ]; then
if [ -n "${USEDOCKER}" ]; then
echo "Initialize database..."
docker exec $DOCKER_CONTAINER_ID mysql -u root -pfriendica -e 'CREATE DATABASE IF NOT EXISTS $DATABASENAME;'
docker exec ${DOCKER_CONTAINER_ID} mysql -u root -pfriendica -e "CREATE DATABASE IF NOT EXISTS ${DATABASE_NAME};"
fi
export MYSQL_HOST="$DATABASEHOST"
export MYSQL_HOST="${DATABASE_HOST}"
#call installer
echo "Installing Friendica..."
"$PHP" ./bin/console.php autoinstall --dbuser="$DATABASEUSER" --dbpass=friendica --dbdata="$DATABASENAME" --dbhost="$DATABASEHOST" --url=https://friendica.local --admin=admin@friendica.local
"${PHP}" ./bin/console.php autoinstall --dbuser="${DATABASE_USER}" --dbpass=friendica --dbdata="${DATABASE_NAME}" --dbhost="${DATABASE_HOST}" --url=https://friendica.local --admin=admin@friendica.local
fi
#test execution
echo "Testing..."
rm -fr "coverage-html"
mkdir "coverage-html"
if [[ "$_XDEBUG_CONFIG" ]]; then
export XDEBUG_CONFIG=$_XDEBUG_CONFIG
if [[ "${_XDEBUG_CONFIG}" ]]; then
export XDEBUG_CONFIG=${_XDEBUG_CONFIG}
fi
COVER=''
if [ -z "$NOCOVERAGE" ]; then
if [ -z "${NOCOVERAGE}" ]; then
COVER="--coverage-clover tests/autotest-clover.xml"
else
echo "No coverage"
@ -229,51 +230,51 @@ function execute_tests() {
# per default, there is no cache installed
GROUP='--exclude-group REDIS,MEMCACHE,MEMCACHED,APCU'
if [ "$TEST_SELECTION" == "REDIS" ]; then
if [ "${TEST_SELECTION}" == "REDIS" ]; then
GROUP="--group REDIS"
fi
if [ "$TEST_SELECTION" == "MEMCACHE" ]; then
if [ "${TEST_SELECTION}" == "MEMCACHE" ]; then
GROUP="--group MEMCACHE"
fi
if [ "$TEST_SELECTION" == "MEMCACHED" ]; then
if [ "${TEST_SELECTION}" == "MEMCACHED" ]; then
GROUP="--group MEMCACHED"
fi
if [ "$TEST_SELECTION" == "APCU" ]; then
if [ "${TEST_SELECTION}" == "APCU" ]; then
GROUP="--group APCU"
fi
if [ "$TEST_SELECTION" == "NODB" ]; then
if [ "${TEST_SELECTION}" == "NODB" ]; then
GROUP="--exclude-group DB,SLOWDB"
fi
INPUT="$BASEDIR/tests"
INPUT="${BASEDIR}/tests"
if [ -n "$2" ]; then
INPUT="$INPUT/$2"
INPUT="${INPUT}/$2"
fi
echo "${PHPUNIT[@]}" --configuration tests/phpunit.xml $GROUP $COVER --log-junit "autotest-results.xml" "$INPUT" "$3"
"${PHPUNIT[@]}" --configuration tests/phpunit.xml $GROUP $COVER --log-junit "autotest-results.xml" "$INPUT" "$3"
echo "${PHPUNIT[@]}" --configuration tests/phpunit.xml ${GROUP} ${COVER} --log-junit "autotest-results.xml" "${INPUT}" "$3"
"${PHPUNIT[@]}" --configuration tests/phpunit.xml ${GROUP} ${COVER} --log-junit "autotest-results.xml" "${INPUT}" "$3"
RESULT=$?
if [ -n "$DOCKER_CONTAINER_ID" ]; then
echo "Kill the docker $DOCKER_CONTAINER_ID"
docker stop $DOCKER_CONTAINER_ID
docker rm -f $DOCKER_CONTAINER_ID
unset $DOCKER_CONTAINER_ID
if [ -n "${DOCKER_CONTAINER_ID}" ]; then
echo "Kill the docker ${DOCKER_CONTAINER_ID}"
docker stop ${DOCKER_CONTAINER_ID}
docker rm -f ${DOCKER_CONTAINER_ID}
unset ${DOCKER_CONTAINER_ID}
fi
}
#
# Start the test execution
#
if [ -z "$1" ] && [ -n "$TEST_SELECTION" ]; then
if [ -z "$1" ] && [ -n "${TEST_SELECTION}" ]; then
# run all known database configs
for DBCONFIG in $DBCONFIGS; do
execute_tests "$DBCONFIG"
for DBCONFIG in ${DBCONFIGS}; do
execute_tests "${DBCONFIG}"
done
else
FILENAME="$2"
if [ -n "$2" ] && [ ! -f "tests/$FILENAME" ] && [ "${FILENAME:0:2}" != "--" ]; then
FILENAME="../$FILENAME"
if [ -n "$2" ] && [ ! -f "tests/${FILENAME}" ] && [ "${FILENAME:0:2}" != "--" ]; then
FILENAME="../${FILENAME}"
fi
execute_tests "$1" "$FILENAME" "$3"
execute_tests "$1" "${FILENAME}" "$3"
fi

View File

@ -58,7 +58,7 @@ case "$MODE" in
OUTFILE="$FULLPATH/../view/lang/C/messages.po"
FINDSTARTDIR="."
# skip addon folder
FINDOPTS="( -path ./addon -or -path ./addons -or -path ./addons-extra -or -path ./tests -or -path ./view/lang -or -path ./view/smarty3 -or -path ./vendor ) -prune -or"
FINDOPTS="( -path ./addon -or -path ./addons -or -path ./addons-extra -or -path ./tests -or -path ./view/lang -or -path ./view/smarty3 -or -path ./vendor -or -path ./local -or -path ./avatar -or -path ./proxy ) -prune -or"
F9KVERSION=$(cat ./VERSION);
echo "Friendica version $F9KVERSION"

View File

@ -30,8 +30,8 @@
use Friendica\Model\Contact;
define('FRIENDICA_PLATFORM', 'Friendica');
define('FRIENDICA_CODENAME', 'Siberian Iris');
define('FRIENDICA_VERSION', '2022.03');
define('FRIENDICA_CODENAME', 'Giant Rhubarb');
define('FRIENDICA_VERSION', '2022.10');
define('DFRN_PROTOCOL_VERSION', '2.23');
define('NEW_TABLE_STRUCTURE_VERSION', 1288);
@ -87,8 +87,8 @@ define('PRIORITIES', [PRIORITY_CRITICAL, PRIORITY_HIGH, PRIORITY_MEDIUM, PRIORIT
/* @}*/
// Normally this constant is defined - but not if "pcntl" isn't installed
if (!defined("SIGTERM")) {
define("SIGTERM", 15);
if (!defined('SIGTERM')) {
define('SIGTERM', 15);
}
/**
@ -117,6 +117,7 @@ function local_user()
if (!empty($_SESSION['authenticated']) && !empty($_SESSION['uid'])) {
return intval($_SESSION['uid']);
}
return false;
}
@ -168,18 +169,13 @@ function remote_user()
* This function save text in session, to be shown to the user at next page load
*
* @param string $s - Text of notice
*
* @return void
* @deprecated since version 2022.09, use \Friendica\Navigation\SystemMessages instead
*/
function notice($s)
function notice(string $s)
{
if (empty($_SESSION)) {
return;
}
if (empty($_SESSION['sysmsg'])) {
$_SESSION['sysmsg'] = [];
}
$_SESSION['sysmsg'][] = $s;
\Friendica\DI::sysmsg()->addNotice($s);
}
/**
@ -188,16 +184,11 @@ function notice($s)
* This function save text in session, to be shown to the user at next page load
*
* @param string $s - Text of notice
*
* @return void
* @deprecated since version 2022.09, use \Friendica\Navigation\SystemMessages instead
*/
function info($s)
function info(string $s)
{
if (empty($_SESSION)) {
return;
}
if (empty($_SESSION['sysmsg_info'])) {
$_SESSION['sysmsg_info'] = [];
}
$_SESSION['sysmsg_info'][] = $s;
\Friendica\DI::sysmsg()->addInfo($s);
}

837
composer.lock generated

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -410,13 +410,13 @@ Ex: Wed May 23 06:01:13 +0000 2007
</tr>
<tr>
<td><code>startTime</code></td>
<td><code>start_time</code></td>
<td>String (UTC <code>YYYY-MM-DD HH:II:SS)</code>)</td>
<td></td>
</tr>
<tr>
<td><code>endTime</code></td>
<td><code>end_time</code></td>
<td>String (UTC <code>YYYY-MM-DD HH:II:SS)</code>)</td>
<td>Optional (null date is <code>0001-01-01 00:00:00</code></td>
</tr>
@ -765,7 +765,7 @@ Identical to [the Twitter Media Object](https://developer.twitter.com/en/docs/tw
<li>64: Unused</li>
<li>128: Mention</li>
<li>256: Tag added to a post</li>
<li>512: Poke</li>
<li>512: Poke (Obsolete)</li>
<li>1024: New post</li>
<li>16384: System email</li>
<li>32768: System event</li>

View File

@ -24,6 +24,32 @@ Returns a list of [Event](help/API-Entities#Event) entities for the current logg
- `since_id`: (optional) minimum event id for pagination
- `count`: maximum number of items returned, default 20
### POST api/friendica/event_create
Create a new event for the current logged in user.
#### Parameters
- `id` : (optional) id of event, event will be amended if supplied
- `name` : name of the event (required)
- `start_time` : start of the event (ISO), required
- `end_time` : (optional) end of the event, event is open end, if not supplied
- `desc` : (optional) description of the event
- `place` : (optional) location of the event
- `publish` : (optional) create message for event
- `allow_cid` : (optional) ACL-formatted list of allowed contact ids if private event
- `allow_gid` : (optional) ACL-formatted list of disallowed contact ids if private event
- `deny_cid` : (optional) ACL-formatted list of allowed group ids if private event
- `deny_gid` : (optional) ACL-formatted list of disallowed group ids if private event
### POST api/friendica/event_delete
Delete event from calendar (not the message)
#### Parameters
- `id` : id of event to be deleted
### GET api/externalprofile/show
Returns a [Contact](help/API-Entities#Contact) entity for the provided profile URL.

View File

@ -84,6 +84,8 @@ These endpoints use the [Mastodon API entities](https://docs.joinmastodon.org/en
- [`GET /api/v1/lists/:id/accounts`](https://docs.joinmastodon.org/methods/timelines/lists/)
- [`POST /api/v1/lists/:id/accounts`](https://docs.joinmastodon.org/methods/timelines/lists/)
- [`DELETE /api/v1/lists/:id/accounts`](https://docs.joinmastodon.org/methods/timelines/lists/)
- [`POST /api/v1/markers`](https://docs.joinmastodon.org/methods/timelines/markers/)
- [`GET /api/v1/markers`](https://docs.joinmastodon.org/methods/timelines/markers/)
- [`POST /api/v1/media`](https://docs.joinmastodon.org/methods/statuses/media/)
- [`GET /api/v1/media/:id`](https://docs.joinmastodon.org/methods/statuses/media/)
- [`PUT /api/v1/media/:id`](https://docs.joinmastodon.org/methods/statuses/media/)
@ -92,6 +94,7 @@ These endpoints use the [Mastodon API entities](https://docs.joinmastodon.org/en
- [`GET /api/v1/notifications/:id`](https://docs.joinmastodon.org/methods/notifications/)
- [`POST /api/v1/notifications/clear`](https://docs.joinmastodon.org/methods/notifications/)
- [`POST /api/v1/notifications/:id/dismiss`](https://docs.joinmastodon.org/methods/notifications/)
- [`GET /api/v1/polls/:id`](https://docs.joinmastodon.org/methods/statuses/polls/)
- [`GET /api/v1/preferences`](https://docs.joinmastodon.org/methods/accounts/preferences/)
- [`DELETE /api/v1/push/subscription`](https://docs.joinmastodon.org/methods/notifications/push/)
- [`GET /api/v1/push/subscription`](https://docs.joinmastodon.org/methods/notifications/push/)
@ -134,6 +137,17 @@ These endpoints use the [Mastodon API entities](https://docs.joinmastodon.org/en
These emdpoints are planned to be implemented somewhere in the future.
- [`PATCH /api/v1/accounts/update_credentials`](https://docs.joinmastodon.org/methods/accounts/)
- [`POST /api/v1/accounts/:id/remove_from_followers`](https://github.com/mastodon/mastodon/pull/16864)
- [`GET /api/v1/accounts/familiar_followers`](https://github.com/mastodon/mastodon/pull/17700)
- [`GET /api/v1/accounts/lookup`](https://github.com/mastodon/mastodon/pull/15740)
- [`GET /api/v1/trends/links`](https://github.com/mastodon/mastodon/pull/16917)
- [`GET /api/v1/trends/statuses`](https://github.com/mastodon/mastodon/pull/17431)
- [`GET /api/v1/trends/tags`](https://github.com/mastodon/mastodon/pull/16917)
- [`POST /api/v1/polls/:id/votes`](https://docs.joinmastodon.org/methods/statuses/polls/)
- [`GET /api/v1/statuses/{id:\d+}/source`](https://github.com/mastodon/mastodon/pull/16697)
- [`GET /api/v1/featured_tags`](https://docs.joinmastodon.org/methods/accounts/featured_tags/)
- [`POST /api/v1/featured_tags`](https://docs.joinmastodon.org/methods/accounts/featured_tags/)
- [`DELETE /api/v1/featured_tags/:id`](https://docs.joinmastodon.org/methods/accounts/featured_tags/)
## Dummy endpoints
@ -144,7 +158,6 @@ They refer to features that don't exist in Friendica yet.
- [`GET /api/v1/announcements`](https://docs.joinmastodon.org/methods/announcements/)
- [`GET /api/v1/endorsements`](https://docs.joinmastodon.org/methods/accounts/endorsements/)
- [`GET /api/v1/filters`](https://docs.joinmastodon.org/methods/accounts/filters/)
- [`GET /api/v1/markers`](https://docs.joinmastodon.org/methods/timelines/markers/)
## Non supportable endpoints
@ -168,9 +181,7 @@ They refer to features or data that don't exist in Friendica yet.
- [`GET /api/v1/domain_blocks`](https://docs.joinmastodon.org/methods/accounts/domain_blocks/)
- [`POST /api/v1/domain_blocks`](https://docs.joinmastodon.org/methods/accounts/domain_blocks/)
- [`DELETE /api/v1/domain_blocks`](https://docs.joinmastodon.org/methods/accounts/domain_blocks/)
- [`GET /api/v1/featured_tags`](https://docs.joinmastodon.org/methods/accounts/featured_tags/)
- [`POST /api/v1/featured_tags`](https://docs.joinmastodon.org/methods/accounts/featured_tags/)
- [`DELETE /api/v1/featured_tags/:id`](https://docs.joinmastodon.org/methods/accounts/featured_tags/)
- [`DELETE /api/v1/emails/confirmations`](https://github.com/mastodon/mastodon/pull/15816)
- [`GET /api/v1/featured_tags/suggestions`](https://docs.joinmastodon.org/methods/accounts/featured_tags/)
- [`GET /api/v1/filters/:id`](https://docs.joinmastodon.org/methods/accounts/filters/)
- [`POST /api/v1/filters/:id`](https://docs.joinmastodon.org/methods/accounts/filters/)
@ -178,9 +189,8 @@ They refer to features or data that don't exist in Friendica yet.
- [`DELETE /api/v1/filters/:id`](https://docs.joinmastodon.org/methods/accounts/filters/)
- [`GET /api/v1/instance/activity`](https://docs.joinmastodon.org/methods/instance#weekly-activity)
- [`POST /api/v1/markers`](https://docs.joinmastodon.org/methods/timelines/markers/)
- [`GET /api/v1/polls/:id`](https://docs.joinmastodon.org/methods/statuses/polls/)
- [`POST /api/v1/polls/:id/votes`](https://docs.joinmastodon.org/methods/statuses/polls/)
- [`POST /api/v1/reports`](https://docs.joinmastodon.org/methods/accounts/reports/)
- [`PUT /api/v1/scheduled_statuses/:id`](https://docs.joinmastodon.org/methods/statuses/scheduled_statuses/)
- [`GET /api/v1/statuses/{id:\d+}/history`](https://github.com/mastodon/mastodon/pull/16697)
- [`GET /api/v1/streaming`](https://docs.joinmastodon.org/methods/timelines/streaming/)
- [`DELETE /api/v1/suggestions/:id`](https://docs.joinmastodon.org/methods/accounts/suggestions/)

View File

@ -65,7 +65,8 @@ General
../network
--------
* e - Sort by Comment Date
* t - Sort by Post Date
* t - Sort by Receipt Date
* q - Sort by Creation Date
* r - Conversation (Posts that mention or involve you)
* w - New posts
* m - Favourite Posts
@ -81,6 +82,7 @@ General
../settings
---------
* o - Account
* 2 - Two-factor authentication
* p - Profiles
* t - Additional features
* w - Social Networks

View File

@ -232,14 +232,6 @@ Please note: body contents are bbcode - not HTML
Called when receiving a post from another source. This may also be used to post local activity or system generated messages.
`$b` is the item array of information to be stored in the database and the item body is bbcode.
### settings_form
Called when generating the HTML for the user Settings page.
`$b` is the HTML string of the settings page before the final `</form>` tag.
### settings_post
Called when the Settings pages are submitted.
`$b` is the $_POST array.
### addon_settings
Called when generating the HTML for the addon settings page.
`$data` is an array containing:
@ -719,10 +711,6 @@ Here is a complete list of all hook callbacks with file locations (as of 24-Sep-
Hook::callAll('personal_xrd', $arr);
### mod/ping.php
Hook::callAll('network_ping', $arr);
### mod/parse_url.php
Hook::callAll("parse_link", $arr);
@ -754,11 +742,9 @@ Here is a complete list of all hook callbacks with file locations (as of 24-Sep-
Hook::callAll('addon_settings_post', $_POST);
Hook::callAll('connector_settings_post', $_POST);
Hook::callAll('display_settings_post', $_POST);
Hook::callAll('settings_post', $_POST);
Hook::callAll('addon_settings', $settings_addons);
Hook::callAll('connector_settings', $settings_connectors);
Hook::callAll('display_settings', $o);
Hook::callAll('settings_form', $o);
### mod/photos.php
@ -780,10 +766,6 @@ Here is a complete list of all hook callbacks with file locations (as of 24-Sep-
Hook::callAll('home_init', $ret);
Hook::callAll("home_content", $content);
### mod/poke.php
Hook::callAll('post_local_end', $arr);
### mod/contacts.php
Hook::callAll('contact_edit_post', $_POST);
@ -865,6 +847,10 @@ Here is a complete list of all hook callbacks with file locations (as of 24-Sep-
Hook::callAll('register_account', $uid);
Hook::callAll('remove_user', $user);
### src/Module/Notifications/Ping.php
Hook::callAll('network_ping', $arr);
### src/Module/PermissionTooltip.php
Hook::callAll('lockview_content', $item);
@ -977,10 +963,6 @@ Here is a complete list of all hook callbacks with file locations (as of 24-Sep-
self::callSingle(self::getApp(), 'hook_fork', $fork_hook, $hookdata);
### src/Core/L10n/L10n.php
Hook::callAll('poke_verbs', $arr);
### src/Core/Worker.php
Hook::callAll("proc_run", $arr);

View File

@ -65,17 +65,17 @@ table.bbcodes > * > tr > th {
<td><a href="http://friendi.ca" target="external-link">Friendica</a></td>
</tr>
<tr>
<td>[img]https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.jpg[/img]</td>
<td><img src="https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.jpg" alt="Immagine/foto"></td>
<td>[img]https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.png[/img]</td>
<td><img src="https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.png"></td>
</tr>
<tr>
<td>[img=https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.jpg]The Friendica Logo[/img]</td>
<td><img src="https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.jpg" alt="The Friendica Logo"></td>
<td>[img=https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.png]The Friendica Logo[/img]</td>
<td><img src="https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.png" alt="The Friendica Logo"></td>
</tr>
<tr>
<td>[img=64x32]https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.jpg[/img]<br>
<td>[img=64x32]https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica.svg[/img]<br>
<br>Note: provided height is simply discarded.</td>
<td><img src="https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.jpg" style="width: 64px;"></td>
<td><img src="https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica.svg" style="width: 64px;"></td>
</tr>
<tr>
<td>[size=xx-small]small text[/size]</td>

View File

@ -23,7 +23,7 @@ There you will always find the current stable version of friendica.
Addons are listed at [this page](https://github.com/friendica/friendica-addons).
If you are searching for new themes, you can find them at [Friendica-Themes.com](http://friendica-themes.com/)
If you are searching for new themes, you can find them at [github.com/bkil/friendica-themes](https://github.com/bkil/friendica-themes)
<a name="adminaccount1"></a>
### I've changed my email address now the admin panel is gone?

View File

@ -179,19 +179,17 @@ The available features are client specific and may differ.
* [AndStatus](http://andstatus.org) ([F-Droid](https://f-droid.org/repository/browse/?fdid=org.andstatus.app), [Google Play](https://play.google.com/store/apps/details?id=org.andstatus.app))
* [B4X for Pleroma & Mastodon](https://github.com/AnywhereSoftware/B4X-Pleroma)
* DiCa ([Google Play](https://play.google.com/store/apps/details?id=cool.mixi.dica), last updated 2019)
* [Fedi](https://play.google.com/store/apps/details?id=com.fediverse.app)
* [Fedilab](https://fedilab.app) ([F-Droid](https://f-droid.org/app/fr.gouv.etalab.mastodon), [Google Play](https://play.google.com/store/apps/details?id=app.fedilab.android))
* [Friendiqa](https://git.friendi.ca/lubuwest/Friendiqa) ([F-Droid](https://git.friendi.ca/lubuwest/Friendiqa#install), [Google Play](https://play.google.com/store/apps/details?id=org.qtproject.friendiqa))
* [Husky](https://husky.fwgs.ru)
* [Roma](https://play.google.com/store/apps/details?id=tech.bigfig.roma)
* [Husky](https://git.sr.ht/~captainepoch/husky) ([F-Droid](https://f-droid.org/repository/browse/?fdid=su.xash.husky), [Google Play](https://play.google.com/store/apps/details?id=su.xash.husky))
* [Mastodon for Android](https://github.com/mastodon/mastodon-android) (F-Droid: Pending, [Google-Play](https://play.google.com/store/apps/details?id=org.joinmastodon.android))
* [Subway Tooter](https://github.com/tateisu/SubwayTooter)
* [Tooot](https://tooot.app/)
* [Tusky](https://tusky.app)
* [Twidere](https://dimension.im/) ([F-Droid](https://f-droid.org/repository/browse/?fdid=org.mariotaku.twidere), [Google Play](https://play.google.com/store/apps/details?id=com.twidere.twiderex), [GitHub](https://github.com/TwidereProject/Twidere-Android))
* [TwidereX](https://github.com/TwidereProject/TwidereX-Android)
* [twitlatte](https://github.com/moko256/twitlatte)
* [Yuito](https://github.com/accelforce/Yuito)
* [Tusky](https://tusky.app) ([F-Droid](https://f-droid.org/repository/browse/?fdid=com.keylesspalace.tusky), [Google Play](https://play.google.com/store/apps/details?id=com.keylesspalace.tusky))
* [Twidere](https://github.com/TwidereProject/Twidere-Android) ([F-Droid](https://f-droid.org/repository/browse/?fdid=org.mariotaku.twidere), [Google Play](https://play.google.com/store/apps/details?id=com.twidere.twiderex))
* [TwidereX](https://github.com/TwidereProject/TwidereX-Android) ([F-Droid](https://f-droid.org/en/packages/com.twidere.twiderex/), [Google Play](https://play.google.com/store/apps/details?id=com.twidere.twiderex))
* [Yuito](https://github.com/accelforce/Yuito) ([Google Play](https://play.google.com/store/apps/details?id=net.accelf.yuito))
#### SailfishOS
@ -199,12 +197,11 @@ The available features are client specific and may differ.
#### iOS
* [B4X for Pleroma & Mastodon](https://www.b4x.com/) ([AppStore](https://apps.apple.com/app/b4x-pleroma/id1538396871), [GitHub](https://github.com/AnywhereSoftware/B4X-Pleroma))
* [B4X for Pleroma & Mastodon](https://github.com/AnywhereSoftware/B4X-Pleroma) ([AppStore](https://apps.apple.com/app/b4x-pleroma/id1538396871))
* [Fedi](https://fediapp.com) ([AppStore](https://apps.apple.com/de/app/fedi-for-pleroma-and-mastodon/id1478806281))
* [Mastodon](https://joinmastodon.org/apps)([AppStore](https://apps.apple.com/us/app/mastodon-for-iphone/id1571998974))
* [Roma](https://www.roma.rocks/)([AppStore](https://apps.apple.com/de/app/roma-for-pleroma-and-mastodon/id1445328699))
* [Mastodon for iPhone and iPad](https://joinmastodon.org/apps) ([AppStore](https://apps.apple.com/us/app/mastodon-for-iphone/id1571998974))
* [Stella*](https://www.stella-app.net/) ([AppStore](https://apps.apple.com/us/app/stella-for-mastodon-twitter/id921372048))
* [Tooot](https://tooot.app/) ([AppStore](https://apps.apple.com/app/id1549772269), [GitHub](https://github.com/tooot-app)), Data collection (not linked to identity)
* [Tooot](https://github.com/tooot-app) ([AppStore](https://apps.apple.com/app/id1549772269), Data collection (not linked to identity)
* [Tootle](https://mastodon.cloud/@tootleapp) ([AppStore](https://apps.apple.com/de/app/tootle-for-mastodon/id1236013466)), last update: 2020
#### Linux
@ -217,9 +214,13 @@ The available features are client specific and may differ.
#### macOS
* [Mastonaut](https://mastonaut.app/) ([AppStore](https://apps.apple.com/us/app/mastonaut/id1450757574)), costs ~8€
* [Mastonaut](https://mastonaut.app/) ([AppStore](https://apps.apple.com/us/app/mastonaut/id1450757574)), closed source
* [Whalebird](https://whalebird.social/en/desktop/contents) ([AppStore](https://apps.apple.com/de/app/whalebird/id1378283354), [GitHub](https://github.com/h3poteto/whalebird-desktop))
#### Windows
* [Whalebird](https://whalebird.social/en/desktop/contents) ([Website Download](https://whalebird.social/en/desktop/contents/downloads#windows), [GitHub](https://github.com/h3poteto/whalebird-desktop))
#### Web Frontend
* [Halcyon](https://www.halcyon.social/)

View File

@ -30,7 +30,7 @@ Due to the large variety of operating systems and PHP platforms in existence we
* Apache with mod-rewrite enabled and "Options All" so you can use a local `.htaccess` file
* PHP 7.3+ (PHP8 is not fully supported yet)
* PHP *command line* access with register_argc_argv set to true in the php.ini file
* Curl, GD, PDO, mbstrings, MySQLi, hash, xml, zip and OpenSSL extensions
* Curl, GD, GMP, PDO, mbstrings, MySQLi, hash, xml, zip and OpenSSL extensions
* The POSIX module of PHP needs to be activated (e.g. [RHEL, CentOS](http://www.bigsoft.co.uk/blog/index.php/2014/12/08/posix-php-commands-not-working-under-centos-7) have disabled it)
* Some form of email server or email gateway such that PHP mail() works.
If you cannot set up your own email server, you can use the [phpmailer](https://github.com/friendica/friendica-addons/tree/develop/phpmailer) addon and use a remote SMTP server.
@ -103,6 +103,17 @@ If you encounter a bug, please let us know.
### Create a database
Create an empty database and note the access details (hostname, username, password, database name).
Generate a strong password, then enter mysql with:
mysql
Then use the following script using the password you just generated:
CREATE DATABASE friendicadb;
CREATE USER 'friendica'@'localhost' IDENTIFIED BY '<<your mysql password here>>';
GRANT ALL ON friendicadb.* TO 'friendica'@'localhost';
FLUSH PRIVILEGES;
EXIT;
Friendica needs the permission to create and delete fields and tables in its own database.

View File

@ -8,27 +8,34 @@ Database Tables
| [2fa_app_specific_password](help/database/db_2fa_app_specific_password) | Two-factor app-specific _password |
| [2fa_recovery_codes](help/database/db_2fa_recovery_codes) | Two-factor authentication recovery codes |
| [2fa_trusted_browser](help/database/db_2fa_trusted_browser) | Two-factor authentication trusted browsers |
| [account-user](help/database/db_account-user) | Remote and local accounts |
| [addon](help/database/db_addon) | registered addons |
| [apcontact](help/database/db_apcontact) | ActivityPub compatible contacts - used in the ActivityPub implementation |
| [application](help/database/db_application) | OAuth application |
| [application-marker](help/database/db_application-marker) | Timeline marker |
| [application-token](help/database/db_application-token) | OAuth user token |
| [arrived-activity](help/database/db_arrived-activity) | Id of arrived activities |
| [attach](help/database/db_attach) | file attachments |
| [cache](help/database/db_cache) | Stores temporary data |
| [config](help/database/db_config) | main configuration storage |
| [contact](help/database/db_contact) | contact table |
| [contact-relation](help/database/db_contact-relation) | Contact relations |
| [conv](help/database/db_conv) | private messages |
| [conversation](help/database/db_conversation) | Raw data and structure information for messages |
| [delayed-post](help/database/db_delayed-post) | Posts that are about to be distributed at a later time |
| [diaspora-interaction](help/database/db_diaspora-interaction) | Signed Diaspora Interaction |
| [endpoint](help/database/db_endpoint) | ActivityPub endpoints - used in the ActivityPub implementation |
| [event](help/database/db_event) | Events |
| [fcontact](help/database/db_fcontact) | Diaspora compatible contacts - used in the Diaspora implementation |
| [fetch-entry](help/database/db_fetch-entry) | |
| [fetched-activity](help/database/db_fetched-activity) | Id of fetched activities |
| [fsuggest](help/database/db_fsuggest) | friend suggestion stuff |
| [group](help/database/db_group) | privacy groups, group info |
| [group_member](help/database/db_group_member) | privacy groups, member info |
| [gserver](help/database/db_gserver) | Global servers |
| [gserver-tag](help/database/db_gserver-tag) | Tags that the server has subscribed |
| [hook](help/database/db_hook) | addon hook registry |
| [inbox-entry](help/database/db_inbox-entry) | Incoming activity |
| [inbox-entry-receiver](help/database/db_inbox-entry-receiver) | Receiver for the incoming activity |
| [inbox-status](help/database/db_inbox-status) | Status of ActivityPub inboxes |
| [intro](help/database/db_intro) | |
| [item-uri](help/database/db_item-uri) | URI and GUID for items |
@ -37,7 +44,7 @@ Database Tables
| [mailacct](help/database/db_mailacct) | Mail account data for fetching mails |
| [manage](help/database/db_manage) | table of accounts that can manage each other |
| [notification](help/database/db_notification) | notifications |
| [notify](help/database/db_notify) | notifications |
| [notify](help/database/db_notify) | [Deprecated] User notifications |
| [notify-threads](help/database/db_notify-threads) | |
| [oembed](help/database/db_oembed) | cache for OEmbed queries |
| [openwebauth-token](help/database/db_openwebauth-token) | Store OpenWebAuth token to verify contacts |
@ -46,11 +53,17 @@ Database Tables
| [permissionset](help/database/db_permissionset) | |
| [photo](help/database/db_photo) | photo storage |
| [post](help/database/db_post) | Structure for all posts |
| [post-activity](help/database/db_post-activity) | Original remote activity |
| [post-category](help/database/db_post-category) | post relation to categories |
| [post-collection](help/database/db_post-collection) | Collection of posts |
| [post-content](help/database/db_post-content) | Content for all posts |
| [post-delivery](help/database/db_post-delivery) | Delivery data for posts for the batch processing |
| [post-delivery-data](help/database/db_post-delivery-data) | Delivery data for items |
| [post-history](help/database/db_post-history) | Post history |
| [post-link](help/database/db_post-link) | Post related external links |
| [post-media](help/database/db_post-media) | Attached media |
| [post-question](help/database/db_post-question) | Question |
| [post-question-option](help/database/db_post-question-option) | Question option |
| [post-tag](help/database/db_post-tag) | post relation to tags |
| [post-thread](help/database/db_post-thread) | Thread related data |
| [post-thread-user](help/database/db_post-thread-user) | Thread related data per user |

View File

@ -7,10 +7,11 @@ Fields
------
| Field | Description | Type | Null | Key | Default | Extra |
| ----------- | ------------------------------------------ | ------------------ | ---- | --- | ------- | ----- |
| ----------- | ---------------------------------------------- | ------------------ | ---- | --- | ------- | ----- |
| cookie_hash | Trusted cookie hash | varchar(80) | NO | PRI | NULL | |
| uid | User ID | mediumint unsigned | NO | | NULL | |
| user_agent | User agent string | text | YES | | NULL | |
| trusted | Whenever this browser should be trusted or not | boolean | NO | | 1 | |
| created | Datetime the trusted browser was recorded | datetime | NO | | NULL | |
| last_used | Datetime the trusted browser was last used | datetime | YES | | NULL | |

View File

@ -0,0 +1,32 @@
Table account-user
===========
Remote and local accounts
Fields
------
| Field | Description | Type | Null | Key | Default | Extra |
| ------ | ------------------------------------------------------------ | ------------------ | ---- | --- | ------- | -------------- |
| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |
| uri-id | Id of the item-uri table entry that contains the account url | int unsigned | NO | | NULL | |
| uid | User ID | mediumint unsigned | NO | | NULL | |
Indexes
------------
| Name | Fields |
| ---------- | ------------------- |
| PRIMARY | id |
| uri-id_uid | UNIQUE, uri-id, uid |
| uid_uri-id | uid, uri-id |
Foreign Keys
------------
| Field | Target Table | Target Field |
|-------|--------------|--------------|
| uri-id | [item-uri](help/database/db_item-uri) | id |
| uid | [user](help/database/db_user) | uid |
Return to [database documentation](help/database)

View File

@ -8,29 +8,32 @@ Fields
| Field | Description | Type | Null | Key | Default | Extra |
| ---------------- | ------------------------------------------------------------------- | -------------- | ---- | --- | ------------------- | ----- |
| url | URL of the contact | varbinary(255) | NO | PRI | NULL | |
| url | URL of the contact | varbinary(383) | NO | PRI | NULL | |
| uri-id | Id of the item-uri table entry that contains the apcontact url | int unsigned | YES | | NULL | |
| uuid | | varchar(255) | YES | | NULL | |
| uuid | | varbinary(255) | YES | | NULL | |
| type | | varchar(20) | NO | | NULL | |
| following | | varchar(255) | YES | | NULL | |
| followers | | varchar(255) | YES | | NULL | |
| inbox | | varchar(255) | NO | | NULL | |
| outbox | | varchar(255) | YES | | NULL | |
| sharedinbox | | varchar(255) | YES | | NULL | |
| following | | varbinary(383) | YES | | NULL | |
| followers | | varbinary(383) | YES | | NULL | |
| inbox | | varbinary(383) | NO | | NULL | |
| outbox | | varbinary(383) | YES | | NULL | |
| sharedinbox | | varbinary(383) | YES | | NULL | |
| featured | Address for the collection of featured posts | varbinary(383) | YES | | NULL | |
| featured-tags | Address for the collection of featured tags | varbinary(383) | YES | | NULL | |
| manually-approve | | boolean | YES | | NULL | |
| discoverable | Mastodon extension: true if profile is published in their directory | boolean | YES | | NULL | |
| suspended | Mastodon extension: true if profile is suspended | boolean | YES | | NULL | |
| nick | | varchar(255) | NO | | | |
| name | | varchar(255) | YES | | NULL | |
| about | | text | YES | | NULL | |
| xmpp | XMPP address | varchar(255) | YES | | NULL | |
| matrix | Matrix address | varchar(255) | YES | | NULL | |
| photo | | varchar(255) | YES | | NULL | |
| header | Header picture | varchar(255) | YES | | NULL | |
| photo | | varbinary(383) | YES | | NULL | |
| header | Header picture | varbinary(383) | YES | | NULL | |
| addr | | varchar(255) | YES | | NULL | |
| alias | | varchar(255) | YES | | NULL | |
| alias | | varbinary(383) | YES | | NULL | |
| pubkey | | text | YES | | NULL | |
| subscribe | | varchar(255) | YES | | NULL | |
| baseurl | baseurl of the ap contact | varchar(255) | YES | | NULL | |
| subscribe | | varbinary(383) | YES | | NULL | |
| baseurl | baseurl of the ap contact | varbinary(383) | YES | | NULL | |
| gsid | Global Server ID | int unsigned | YES | | NULL | |
| generator | Name of the contact's system | varchar(255) | YES | | NULL | |
| following_count | Number of following contacts | int unsigned | YES | | 0 | |

View File

@ -0,0 +1,34 @@
Table application-marker
===========
Timeline marker
Fields
------
| Field | Description | Type | Null | Key | Default | Extra |
| -------------- | ---------------------------- | ------------------ | ---- | --- | ------- | ----- |
| application-id | | int unsigned | NO | PRI | NULL | |
| uid | Owner User id | mediumint unsigned | NO | PRI | NULL | |
| timeline | Marker (home, notifications) | varchar(64) | NO | PRI | NULL | |
| last_read_id | Marker id for the timeline | varbinary(383) | YES | | NULL | |
| version | Version number | smallint unsigned | YES | | NULL | |
| updated_at | creation time | datetime | YES | | NULL | |
Indexes
------------
| Name | Fields |
| ------- | ----------------------------- |
| PRIMARY | application-id, uid, timeline |
| uid_id | uid |
Foreign Keys
------------
| Field | Target Table | Target Field |
|-------|--------------|--------------|
| application-id | [application](help/database/db_application) | id |
| uid | [user](help/database/db_user) | uid |
Return to [database documentation](help/database)

View File

@ -7,13 +7,13 @@ Fields
------
| Field | Description | Type | Null | Key | Default | Extra |
| ------------- | --------------- | ------------ | ---- | --- | ------- | -------------- |
| ------------- | --------------- | -------------- | ---- | --- | ------- | -------------- |
| id | generated index | int unsigned | NO | PRI | NULL | auto_increment |
| client_id | | varchar(64) | NO | | NULL | |
| client_secret | | varchar(64) | NO | | NULL | |
| name | | varchar(255) | NO | | NULL | |
| redirect_uri | | varchar(255) | NO | | NULL | |
| website | | varchar(255) | YES | | NULL | |
| redirect_uri | | varbinary(383) | NO | | NULL | |
| website | | varbinary(383) | YES | | NULL | |
| scopes | | varchar(255) | YES | | NULL | |
| read | Read scope | boolean | YES | | NULL | |
| write | Write scope | boolean | YES | | NULL | |

View File

@ -0,0 +1,22 @@
Table arrived-activity
===========
Id of arrived activities
Fields
------
| Field | Description | Type | Null | Key | Default | Extra |
| --------- | ---------------------------------- | -------------- | ---- | --- | ------- | ----- |
| object-id | object id of the incoming activity | varbinary(383) | NO | PRI | NULL | |
| received | Receiving date | datetime | YES | | NULL | |
Indexes
------------
| Name | Fields |
| ------- | --------- |
| PRIMARY | object-id |
Return to [database documentation](help/database)

View File

@ -20,26 +20,28 @@ Fields
| keywords | public keywords (interests) of the contact | text | YES | | NULL | |
| xmpp | XMPP address | varchar(255) | NO | | | |
| matrix | Matrix address | varchar(255) | NO | | | |
| avatar | | varchar(255) | NO | | | |
| header | Header picture | varchar(255) | YES | | NULL | |
| url | | varchar(255) | NO | | | |
| nurl | | varchar(255) | NO | | | |
| avatar | | varbinary(383) | NO | | | |
| header | Header picture | varbinary(383) | YES | | NULL | |
| url | | varbinary(383) | NO | | | |
| nurl | | varbinary(383) | NO | | | |
| uri-id | Id of the item-uri table entry that contains the contact url | int unsigned | YES | | NULL | |
| addr | | varchar(255) | NO | | | |
| alias | | varchar(255) | NO | | | |
| alias | | varbinary(383) | NO | | | |
| pubkey | RSA public key 4096 bit | text | YES | | NULL | |
| prvkey | RSA private key 4096 bit | text | YES | | NULL | |
| batch | | varchar(255) | NO | | | |
| notify | | varchar(255) | YES | | NULL | |
| poll | | varchar(255) | YES | | NULL | |
| subscribe | | varchar(255) | YES | | NULL | |
| batch | | varbinary(383) | NO | | | |
| notify | | varbinary(383) | YES | | NULL | |
| poll | | varbinary(383) | YES | | NULL | |
| subscribe | | varbinary(383) | YES | | NULL | |
| last-update | Date of the last try to update the contact info | datetime | NO | | 0001-01-01 00:00:00 | |
| next-update | Next connection request | datetime | YES | | NULL | |
| success_update | Date of the last successful contact update | datetime | NO | | 0001-01-01 00:00:00 | |
| failure_update | Date of the last failed update | datetime | NO | | 0001-01-01 00:00:00 | |
| failed | Connection failed | boolean | YES | | NULL | |
| term-date | | datetime | NO | | 0001-01-01 00:00:00 | |
| last-item | date of the last post | datetime | NO | | 0001-01-01 00:00:00 | |
| last-discovery | date of the last follower discovery | datetime | NO | | 0001-01-01 00:00:00 | |
| local-data | Is true when there are posts with this contact on the system | boolean | YES | | NULL | |
| blocked | Node-wide block status | boolean | NO | | 1 | |
| block_reason | Node-wide block reason | text | YES | | NULL | |
| readonly | posts of the contact are readonly | boolean | NO | | 0 | |
@ -48,7 +50,7 @@ Fields
| archive | | boolean | NO | | 0 | |
| unsearchable | Contact prefers to not be searchable | boolean | NO | | 0 | |
| sensitive | Contact posts sensitive content | boolean | NO | | 0 | |
| baseurl | baseurl of the contact | varchar(255) | YES | | | |
| baseurl | baseurl of the contact | varbinary(383) | YES | | | |
| gsid | Global Server ID | int unsigned | YES | | NULL | |
| bd | | date | NO | | 0001-01-01 | |
| reason | | text | YES | | NULL | |
@ -57,7 +59,7 @@ Fields
| rel | The kind of the relation between the user and the contact | tinyint unsigned | NO | | 0 | |
| protocol | Protocol of the contact | char(4) | NO | | | |
| subhub | | boolean | NO | | 0 | |
| hub-verify | | varchar(255) | NO | | | |
| hub-verify | | varbinary(383) | NO | | | |
| rating | Automatically detected feed poll frequency | tinyint | NO | | 0 | |
| priority | Feed poll priority | tinyint unsigned | NO | | 0 | |
| attag | | varchar(255) | NO | | | |
@ -68,15 +70,15 @@ Fields
| notify_new_posts | | boolean | NO | | 0 | |
| fetch_further_information | | tinyint unsigned | NO | | 0 | |
| ffi_keyword_denylist | | text | YES | | NULL | |
| photo | Link to the profile photo of the contact | varchar(255) | YES | | | |
| thumb | Link to the profile photo (thumb size) | varchar(255) | YES | | | |
| micro | Link to the profile photo (micro size) | varchar(255) | YES | | | |
| photo | Link to the profile photo of the contact | varbinary(383) | YES | | | |
| thumb | Link to the profile photo (thumb size) | varbinary(383) | YES | | | |
| micro | Link to the profile photo (micro size) | varbinary(383) | YES | | | |
| name-date | | datetime | NO | | 0001-01-01 00:00:00 | |
| uri-date | | datetime | NO | | 0001-01-01 00:00:00 | |
| avatar-date | | datetime | NO | | 0001-01-01 00:00:00 | |
| request | | varchar(255) | YES | | NULL | |
| confirm | | varchar(255) | YES | | NULL | |
| poco | | varchar(255) | YES | | NULL | |
| request | | varbinary(383) | YES | | NULL | |
| confirm | | varbinary(383) | YES | | NULL | |
| poco | | varbinary(383) | YES | | NULL | |
| writable | | boolean | NO | | 0 | |
| forum | contact is a forum. Deprecated, use 'contact-type' = 'community' and 'manually-approve' = false instead | boolean | NO | | 0 | |
| prv | contact is a private group. Deprecated, use 'contact-type' = 'community' and 'manually-approve' = true instead | boolean | NO | | 0 | |
@ -84,8 +86,8 @@ Fields
| site-pubkey | Deprecated | text | YES | | NULL | |
| gender | Deprecated | varchar(32) | NO | | | |
| duplex | Deprecated | boolean | NO | | 0 | |
| issued-id | Deprecated | varchar(255) | NO | | | |
| dfrn-id | Deprecated | varchar(255) | NO | | | |
| issued-id | Deprecated | varbinary(383) | NO | | | |
| dfrn-id | Deprecated | varbinary(383) | NO | | | |
| aes_allow | Deprecated | boolean | NO | | 0 | |
| ret-aes | Deprecated | boolean | NO | | 0 | |
| usehub | Deprecated | boolean | NO | | 0 | |
@ -112,12 +114,14 @@ Indexes
| attag_uid | attag(96), uid |
| network_uid_lastupdate | network, uid, last-update |
| uid_network_self_lastupdate | uid, network, self, last-update |
| next-update | next-update |
| local-data-next-update | local-data, next-update |
| uid_lastitem | uid, last-item |
| baseurl | baseurl(64) |
| uid_contact-type | uid, contact-type |
| uid_self_contact-type | uid, self, contact-type |
| self_network_uid | self, network, uid |
| gsid | gsid |
| gsid_uid_failed | gsid, uid, failed |
| uri-id | uri-id |
Foreign Keys

View File

@ -9,7 +9,7 @@ Fields
| Field | Description | Type | Null | Key | Default | Extra |
| ------- | ----------------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- |
| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |
| guid | A unique identifier for this conversation | varchar(255) | NO | | | |
| guid | A unique identifier for this conversation | varbinary(255) | NO | | | |
| recips | sender_handle;recipient_handle | text | YES | | NULL | |
| uid | Owner User id | mediumint unsigned | NO | | 0 | |
| creator | handle of creator | varchar(255) | NO | | | |

View File

@ -9,7 +9,7 @@ Fields
| Field | Description | Type | Null | Key | Default | Extra |
| ------- | ---------------------------------------------- | ------------------ | ---- | --- | ------- | -------------- |
| id | | int unsigned | NO | PRI | NULL | auto_increment |
| uri | URI of the post that will be distributed later | varchar(255) | YES | | NULL | |
| uri | URI of the post that will be distributed later | varbinary(383) | YES | | NULL | |
| uid | Owner User id | mediumint unsigned | YES | | NULL | |
| delayed | delay time | datetime | YES | | NULL | |
| wid | Workerqueue id | int unsigned | YES | | NULL | |

View File

@ -0,0 +1,30 @@
Table endpoint
===========
ActivityPub endpoints - used in the ActivityPub implementation
Fields
------
| Field | Description | Type | Null | Key | Default | Extra |
| ------------ | -------------------------------------------------------------- | -------------- | ---- | --- | ------- | ----- |
| url | URL of the contact | varbinary(383) | NO | PRI | NULL | |
| type | | varchar(20) | NO | | NULL | |
| owner-uri-id | Id of the item-uri table entry that contains the apcontact url | int unsigned | YES | | NULL | |
Indexes
------------
| Name | Fields |
| ----------------- | -------------------------- |
| PRIMARY | url |
| owner-uri-id_type | UNIQUE, owner-uri-id, type |
Foreign Keys
------------
| Field | Target Table | Target Field |
|-------|--------------|--------------|
| owner-uri-id | [item-uri](help/database/db_item-uri) | id |
Return to [database documentation](help/database)

View File

@ -9,10 +9,10 @@ Fields
| Field | Description | Type | Null | Key | Default | Extra |
| --------- | ---------------------------------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- |
| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |
| guid | | varchar(255) | NO | | | |
| guid | | varbinary(255) | NO | | | |
| uid | Owner User id | mediumint unsigned | NO | | 0 | |
| cid | contact_id (ID of the contact in contact table) | int unsigned | NO | | 0 | |
| uri | | varchar(255) | NO | | | |
| uri | | varbinary(383) | NO | | | |
| uri-id | Id of the item-uri table entry that contains the event uri | int unsigned | YES | | NULL | |
| created | creation time | datetime | NO | | 0001-01-01 00:00:00 | |
| edited | last edit time | datetime | NO | | 0001-01-01 00:00:00 | |

View File

@ -9,22 +9,23 @@ Fields
| Field | Description | Type | Null | Key | Default | Extra |
| ----------------- | ------------------------------------------------------------- | ---------------- | ---- | --- | ------------------- | -------------- |
| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |
| guid | unique id | varchar(255) | NO | | | |
| url | | varchar(255) | NO | | | |
| guid | unique id | varbinary(255) | NO | | | |
| url | | varbinary(383) | NO | | | |
| uri-id | Id of the item-uri table entry that contains the fcontact url | int unsigned | YES | | NULL | |
| name | | varchar(255) | NO | | | |
| photo | | varchar(255) | NO | | | |
| request | | varchar(255) | NO | | | |
| photo | | varbinary(383) | NO | | | |
| request | | varbinary(383) | NO | | | |
| nick | | varchar(255) | NO | | | |
| addr | | varchar(255) | NO | | | |
| batch | | varchar(255) | NO | | | |
| notify | | varchar(255) | NO | | | |
| poll | | varchar(255) | NO | | | |
| confirm | | varchar(255) | NO | | | |
| batch | | varbinary(383) | NO | | | |
| notify | | varbinary(383) | NO | | | |
| poll | | varbinary(383) | NO | | | |
| confirm | | varbinary(383) | NO | | | |
| priority | | tinyint unsigned | NO | | 0 | |
| network | | char(4) | NO | | | |
| alias | | varchar(255) | NO | | | |
| alias | | varbinary(383) | NO | | | |
| pubkey | | text | YES | | NULL | |
| created | | datetime | NO | | 0001-01-01 00:00:00 | |
| updated | | datetime | NO | | 0001-01-01 00:00:00 | |
| interacting_count | Number of contacts this contact interactes with | int unsigned | YES | | 0 | |
| interacted_count | Number of contacts that interacted with this contact | int unsigned | YES | | 0 | |

View File

@ -0,0 +1,33 @@
Table fetch-entry
===========
Fields
------
| Field | Description | Type | Null | Key | Default | Extra |
| ------- | ---------------------------------- | -------------- | ---- | --- | ------------------- | -------------- |
| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |
| url | url that awaiting to be fetched | varbinary(383) | YES | | NULL | |
| created | Creation date of the fetch request | datetime | NO | | 0001-01-01 00:00:00 | |
| wid | Workerqueue id | int unsigned | YES | | NULL | |
Indexes
------------
| Name | Fields |
| ------- | ----------- |
| PRIMARY | id |
| url | UNIQUE, url |
| created | created |
| wid | wid |
Foreign Keys
------------
| Field | Target Table | Target Field |
|-------|--------------|--------------|
| wid | [workerqueue](help/database/db_workerqueue) | id |
Return to [database documentation](help/database)

View File

@ -0,0 +1,22 @@
Table fetched-activity
===========
Id of fetched activities
Fields
------
| Field | Description | Type | Null | Key | Default | Extra |
| --------- | ----------------------------- | -------------- | ---- | --- | ------- | ----- |
| object-id | object id of fetched activity | varbinary(383) | NO | PRI | NULL | |
| received | Receiving date | datetime | YES | | NULL | |
Indexes
------------
| Name | Fields |
| ------- | --------- |
| PRIMARY | object-id |
Return to [database documentation](help/database)

View File

@ -12,9 +12,9 @@ Fields
| uid | User id | mediumint unsigned | NO | | 0 | |
| cid | | int unsigned | NO | | 0 | |
| name | | varchar(255) | NO | | | |
| url | | varchar(255) | NO | | | |
| request | | varchar(255) | NO | | | |
| photo | | varchar(255) | NO | | | |
| url | | varbinary(383) | NO | | | |
| request | | varbinary(383) | NO | | | |
| photo | | varbinary(383) | NO | | | |
| note | | text | YES | | NULL | |
| created | | datetime | NO | | 0001-01-01 00:00:00 | |

View File

@ -9,8 +9,8 @@ Fields
| Field | Description | Type | Null | Key | Default | Extra |
| --------------------- | -------------------------------------------------- | ---------------- | ---- | --- | ------------------- | -------------- |
| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |
| url | | varchar(255) | NO | | | |
| nurl | | varchar(255) | NO | | | |
| url | | varbinary(383) | NO | | | |
| nurl | | varbinary(383) | NO | | | |
| version | | varchar(255) | NO | | | |
| site_name | | varchar(255) | NO | | | |
| info | | text | YES | | NULL | |
@ -22,8 +22,8 @@ Fields
| local-posts | Number of local posts | int unsigned | YES | | NULL | |
| local-comments | Number of local comments | int unsigned | YES | | NULL | |
| directory-type | Type of directory service (Poco, Mastodon) | tinyint | YES | | 0 | |
| poco | | varchar(255) | NO | | | |
| noscrape | | varchar(255) | NO | | | |
| poco | | varbinary(383) | NO | | | |
| noscrape | | varbinary(383) | NO | | | |
| network | | char(4) | NO | | | |
| protocol | The protocol of the server | tinyint unsigned | YES | | NULL | |
| platform | | varchar(255) | NO | | | |

View File

@ -0,0 +1,30 @@
Table inbox-entry-receiver
===========
Receiver for the incoming activity
Fields
------
| Field | Description | Type | Null | Key | Default | Extra |
| -------- | ----------- | ------------------ | ---- | --- | ------- | ----- |
| queue-id | | int unsigned | NO | PRI | NULL | |
| uid | User id | mediumint unsigned | NO | PRI | NULL | |
Indexes
------------
| Name | Fields |
| ------- | ------------- |
| PRIMARY | queue-id, uid |
| uid | uid |
Foreign Keys
------------
| Field | Target Table | Target Field |
|-------|--------------|--------------|
| queue-id | [inbox-entry](help/database/db_inbox-entry) | id |
| uid | [user](help/database/db_user) | uid |
Return to [database documentation](help/database)

View File

@ -0,0 +1,44 @@
Table inbox-entry
===========
Incoming activity
Fields
------
| Field | Description | Type | Null | Key | Default | Extra |
| ------------------ | -------------------------------------- | -------------- | ---- | --- | ------- | -------------- |
| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |
| activity-id | id of the incoming activity | varbinary(383) | YES | | NULL | |
| object-id | | varbinary(383) | YES | | NULL | |
| in-reply-to-id | | varbinary(383) | YES | | NULL | |
| conversation | | varbinary(383) | YES | | NULL | |
| type | Type of the activity | varchar(64) | YES | | NULL | |
| object-type | Type of the object activity | varchar(64) | YES | | NULL | |
| object-object-type | Type of the object's object activity | varchar(64) | YES | | NULL | |
| received | Receiving date | datetime | YES | | NULL | |
| activity | The JSON activity | mediumtext | YES | | NULL | |
| signer | | varchar(255) | YES | | NULL | |
| push | Is the entry pushed or have pulled it? | boolean | YES | | NULL | |
| trust | Do we trust this entry? | boolean | YES | | NULL | |
| wid | Workerqueue id | int unsigned | YES | | NULL | |
Indexes
------------
| Name | Fields |
| ----------- | ------------------- |
| PRIMARY | id |
| activity-id | UNIQUE, activity-id |
| object-id | object-id |
| received | received |
| wid | wid |
Foreign Keys
------------
| Field | Target Table | Target Field |
|-------|--------------|--------------|
| wid | [workerqueue](help/database/db_workerqueue) | id |
Return to [database documentation](help/database)

View File

@ -8,7 +8,8 @@ Fields
| Field | Description | Type | Null | Key | Default | Extra |
| -------- | ------------------------------------ | -------------- | ---- | --- | ------------------- | ----- |
| url | URL of the inbox | varbinary(255) | NO | PRI | NULL | |
| url | URL of the inbox | varbinary(383) | NO | PRI | NULL | |
| uri-id | Item-uri id of inbox url | int unsigned | YES | | NULL | |
| created | Creation date of this entry | datetime | NO | | 0001-01-01 00:00:00 | |
| success | Date of the last successful delivery | datetime | NO | | 0001-01-01 00:00:00 | |
| failure | Date of the last failed delivery | datetime | NO | | 0001-01-01 00:00:00 | |
@ -22,6 +23,13 @@ Indexes
| Name | Fields |
| ------- | ------ |
| PRIMARY | url |
| uri-id | uri-id |
Foreign Keys
------------
| Field | Target Table | Target Field |
|-------|--------------|--------------|
| uri-id | [item-uri](help/database/db_item-uri) | id |
Return to [database documentation](help/database)

View File

@ -16,7 +16,7 @@ Fields
| knowyou | | boolean | NO | | 0 | |
| duplex | deprecated | boolean | NO | | 0 | |
| note | | text | YES | | NULL | |
| hash | | varchar(255) | NO | | | |
| hash | | varbinary(255) | NO | | | |
| datetime | | datetime | NO | | 0001-01-01 00:00:00 | |
| blocked | deprecated | boolean | NO | | 0 | |
| ignore | | boolean | NO | | 0 | |

View File

@ -9,7 +9,7 @@ Fields
| Field | Description | Type | Null | Key | Default | Extra |
| ----- | ------------------------------- | -------------- | ---- | --- | ------- | -------------- |
| id | | int unsigned | NO | PRI | NULL | auto_increment |
| uri | URI of an item | varbinary(255) | NO | | NULL | |
| uri | URI of an item | varbinary(383) | NO | | NULL | |
| guid | A unique identifier for an item | varbinary(255) | YES | | NULL | |
Indexes

View File

@ -10,11 +10,11 @@ Fields
| ------------- | -------------------------------------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- |
| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |
| uid | Owner User id | mediumint unsigned | NO | | 0 | |
| guid | A unique identifier for this private message | varchar(255) | NO | | | |
| guid | A unique identifier for this private message | varbinary(255) | NO | | | |
| from-name | name of the sender | varchar(255) | NO | | | |
| from-photo | contact photo link of the sender | varchar(255) | NO | | | |
| from-url | profile linke of the sender | varchar(255) | NO | | | |
| contact-id | contact.id | varchar(255) | YES | | NULL | |
| from-photo | contact photo link of the sender | varbinary(383) | NO | | | |
| from-url | profile linke of the sender | varbinary(383) | NO | | | |
| contact-id | contact.id | varbinary(255) | YES | | NULL | |
| author-id | Link to the contact table with uid=0 of the author of the mail | int unsigned | YES | | NULL | |
| convid | conv.id | int unsigned | YES | | NULL | |
| title | | varchar(255) | NO | | | |
@ -23,11 +23,11 @@ Fields
| reply | | boolean | NO | | 0 | |
| replied | | boolean | NO | | 0 | |
| unknown | if sender not in the contact table this is 1 | boolean | NO | | 0 | |
| uri | | varchar(255) | NO | | | |
| uri | | varbinary(383) | NO | | | |
| uri-id | Item-uri id of the related mail | int unsigned | YES | | NULL | |
| parent-uri | | varchar(255) | NO | | | |
| parent-uri | | varbinary(383) | NO | | | |
| parent-uri-id | Item-uri id of the parent of the related mail | int unsigned | YES | | NULL | |
| thr-parent | | varchar(255) | YES | | NULL | |
| thr-parent | | varbinary(383) | YES | | NULL | |
| thr-parent-id | Id of the item-uri table that contains the thread parent uri | int unsigned | YES | | NULL | |
| created | creation time of the private message | datetime | NO | | 0001-01-01 00:00:00 | |

View File

@ -11,7 +11,7 @@ Fields
| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |
| uid | Owner User id | mediumint unsigned | YES | | NULL | |
| vid | Id of the verb table entry that contains the activity verbs | smallint unsigned | YES | | NULL | |
| type | | tinyint unsigned | YES | | NULL | |
| type | | smallint unsigned | YES | | NULL | |
| actor-id | Link to the contact table with uid=0 of the actor that caused the notification | int unsigned | YES | | NULL | |
| target-uri-id | Item-uri id of the related post | int unsigned | YES | | NULL | |
| parent-uri-id | Item-uri id of the parent of the related post | int unsigned | YES | | NULL | |
@ -31,6 +31,7 @@ Indexes
| target-uri-id | target-uri-id |
| parent-uri-id | parent-uri-id |
| seen_uid | seen, uid |
| uid_type_parent-uri-id_actor-id | uid, type, parent-uri-id, actor-id |
Foreign Keys
------------

View File

@ -1,7 +1,7 @@
Table notify
===========
notifications
[Deprecated] User notifications
Fields
------
@ -11,12 +11,12 @@ Fields
| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |
| type | | smallint unsigned | NO | | 0 | |
| name | | varchar(255) | NO | | | |
| url | | varchar(255) | NO | | | |
| photo | | varchar(255) | NO | | | |
| url | | varbinary(383) | NO | | | |
| photo | | varbinary(383) | NO | | | |
| date | | datetime | NO | | 0001-01-01 00:00:00 | |
| msg | | mediumtext | YES | | NULL | |
| uid | Owner User id | mediumint unsigned | NO | | 0 | |
| link | | varchar(255) | NO | | | |
| link | | varbinary(383) | NO | | | |
| iid | | int unsigned | YES | | NULL | |
| parent | | int unsigned | YES | | NULL | |
| uri-id | Item-uri id of the related post | int unsigned | YES | | NULL | |

View File

@ -8,7 +8,7 @@ Fields
| Field | Description | Type | Null | Key | Default | Extra |
| -------- | ------------------------------ | ------------------ | ---- | --- | ------------------- | ----- |
| url | page url | varbinary(255) | NO | PRI | NULL | |
| url | page url | varbinary(383) | NO | PRI | NULL | |
| maxwidth | Maximum width passed to Oembed | mediumint unsigned | NO | PRI | NULL | |
| content | OEmbed data of the page | mediumtext | YES | | NULL | |
| created | datetime of creation | datetime | NO | | 0001-01-01 00:00:00 | |

View File

@ -0,0 +1,29 @@
Table post-activity
===========
Original remote activity
Fields
------
| Field | Description | Type | Null | Key | Default | Extra |
| -------- | --------------------------------------------------------- | ------------ | ---- | --- | ------- | ----- |
| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | NO | PRI | NULL | |
| activity | Original activity | mediumtext | YES | | NULL | |
| received | | datetime | YES | | NULL | |
Indexes
------------
| Name | Fields |
| ------- | ------ |
| PRIMARY | uri-id |
Foreign Keys
------------
| Field | Target Table | Target Field |
|-------|--------------|--------------|
| uri-id | [item-uri](help/database/db_item-uri) | id |
Return to [database documentation](help/database)

View File

@ -17,10 +17,10 @@ Indexes
------------
| Name | Fields |
| ------- | ---------------------- |
| ---------- | ---------------------- |
| PRIMARY | uri-id, uid, type, tid |
| uri-id | tid |
| uid | uid |
| tid | tid |
| uid_uri-id | uid, uri-id |
Foreign Keys
------------

View File

@ -0,0 +1,32 @@
Table post-collection
===========
Collection of posts
Fields
------
| Field | Description | Type | Null | Key | Default | Extra |
| --------- | --------------------------------------------------------- | ---------------- | ---- | --- | ------- | ----- |
| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | NO | PRI | NULL | |
| type | 0 - Featured | tinyint unsigned | NO | PRI | 0 | |
| author-id | Author of the featured post | int unsigned | YES | | NULL | |
Indexes
------------
| Name | Fields |
| --------- | ------------ |
| PRIMARY | uri-id, type |
| type | type |
| author-id | author-id |
Foreign Keys
------------
| Field | Target Table | Target Field |
|-------|--------------|--------------|
| uri-id | [item-uri](help/database/db_item-uri) | id |
| author-id | [contact](help/database/db_contact) | id |
Return to [database documentation](help/database)

View File

@ -7,7 +7,7 @@ Fields
------
| Field | Description | Type | Null | Key | Default | Extra |
| --------------- | ------------------------------------------------------------------------------------------------------------------------- | ------------ | ---- | --- | ------- | ----- |
| --------------- | ------------------------------------------------------------------------------------------------------------------------- | -------------- | ---- | --- | ------- | ----- |
| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | NO | PRI | NULL | |
| title | item title | varchar(255) | NO | | | |
| content-warning | | varchar(255) | NO | | | |
@ -24,7 +24,7 @@ Fields
| target-type | ActivityStreams target type if applicable (URI) | varchar(100) | NO | | | |
| target | JSON encoded target structure if used | text | YES | | NULL | |
| resource-id | Used to link other tables to items, it identifies the linked resource (e.g. photo) and if set must also set resource_type | varchar(32) | NO | | | |
| plink | permalink or URL to a displayable copy of the message at its source | varchar(255) | NO | | | |
| plink | permalink or URL to a displayable copy of the message at its source | varbinary(383) | NO | | | |
Indexes
------------

View File

@ -0,0 +1,37 @@
Table post-delivery
===========
Delivery data for posts for the batch processing
Fields
------
| Field | Description | Type | Null | Key | Default | Extra |
| --------- | --------------------------------------------------------- | ------------------ | ---- | --- | ------------------- | ----- |
| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | NO | PRI | NULL | |
| inbox-id | Item-uri id of inbox url | int unsigned | NO | PRI | NULL | |
| uid | Delivering user | mediumint unsigned | YES | | NULL | |
| created | | datetime | YES | | 0001-01-01 00:00:00 | |
| command | | varbinary(32) | YES | | NULL | |
| failed | Number of times the delivery has failed | tinyint | YES | | 0 | |
| receivers | JSON encoded array with the receiving contacts | mediumtext | YES | | NULL | |
Indexes
------------
| Name | Fields |
| ---------------- | ----------------- |
| PRIMARY | uri-id, inbox-id |
| inbox-id_created | inbox-id, created |
| uid | uid |
Foreign Keys
------------
| Field | Target Table | Target Field |
|-------|--------------|--------------|
| uri-id | [item-uri](help/database/db_item-uri) | id |
| inbox-id | [item-uri](help/database/db_item-uri) | id |
| uid | [user](help/database/db_user) | uid |
Return to [database documentation](help/database)

View File

@ -0,0 +1,44 @@
Table post-history
===========
Post history
Fields
------
| Field | Description | Type | Null | Key | Default | Extra |
| --------------- | ------------------------------------------------------------------------------------------------------------------------- | -------------- | ---- | --- | ------------------- | ----- |
| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | NO | PRI | NULL | |
| edited | Date of edit | datetime | NO | PRI | 0001-01-01 00:00:00 | |
| title | item title | varchar(255) | NO | | | |
| content-warning | | varchar(255) | NO | | | |
| body | item body content | mediumtext | YES | | NULL | |
| raw-body | Body without embedded media links | mediumtext | YES | | NULL | |
| location | text location where this item originated | varchar(255) | NO | | | |
| coord | longitude/latitude pair representing location where this item originated | varchar(255) | NO | | | |
| language | Language information about this post | text | YES | | NULL | |
| app | application which generated this item | varchar(255) | NO | | | |
| rendered-hash | | varchar(32) | NO | | | |
| rendered-html | item.body converted to html | mediumtext | YES | | NULL | |
| object-type | ActivityStreams object type | varchar(100) | NO | | | |
| object | JSON encoded object structure unless it is an implied object (normal post) | text | YES | | NULL | |
| target-type | ActivityStreams target type if applicable (URI) | varchar(100) | NO | | | |
| target | JSON encoded target structure if used | text | YES | | NULL | |
| resource-id | Used to link other tables to items, it identifies the linked resource (e.g. photo) and if set must also set resource_type | varchar(32) | NO | | | |
| plink | permalink or URL to a displayable copy of the message at its source | varbinary(383) | NO | | | |
Indexes
------------
| Name | Fields |
| ------- | -------------- |
| PRIMARY | uri-id, edited |
Foreign Keys
------------
| Field | Target Table | Target Field |
|-------|--------------|--------------|
| uri-id | [item-uri](help/database/db_item-uri) | id |
Return to [database documentation](help/database)

View File

@ -10,31 +10,32 @@ Fields
| --------------- | --------------------------------------------------------- | ----------------- | ---- | --- | ------- | -------------- |
| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |
| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | NO | | NULL | |
| url | Media URL | varbinary(511) | NO | | NULL | |
| url | Media URL | varbinary(1024) | NO | | NULL | |
| type | Media type | tinyint unsigned | NO | | 0 | |
| mimetype | | varchar(60) | YES | | NULL | |
| height | Height of the media | smallint unsigned | YES | | NULL | |
| width | Width of the media | smallint unsigned | YES | | NULL | |
| size | Media size | int unsigned | YES | | NULL | |
| preview | Preview URL | varbinary(255) | YES | | NULL | |
| size | Media size | bigint unsigned | YES | | NULL | |
| preview | Preview URL | varbinary(512) | YES | | NULL | |
| preview-height | Height of the preview picture | smallint unsigned | YES | | NULL | |
| preview-width | Width of the preview picture | smallint unsigned | YES | | NULL | |
| description | | text | YES | | NULL | |
| name | Name of the media | varchar(255) | YES | | NULL | |
| author-url | URL of the author of the media | varbinary(255) | YES | | NULL | |
| author-url | URL of the author of the media | varbinary(383) | YES | | NULL | |
| author-name | Name of the author of the media | varchar(255) | YES | | NULL | |
| author-image | Image of the author of the media | varbinary(255) | YES | | NULL | |
| publisher-url | URL of the publisher of the media | varbinary(255) | YES | | NULL | |
| author-image | Image of the author of the media | varbinary(383) | YES | | NULL | |
| publisher-url | URL of the publisher of the media | varbinary(383) | YES | | NULL | |
| publisher-name | Name of the publisher of the media | varchar(255) | YES | | NULL | |
| publisher-image | Image of the publisher of the media | varbinary(255) | YES | | NULL | |
| publisher-image | Image of the publisher of the media | varbinary(383) | YES | | NULL | |
Indexes
------------
| Name | Fields |
| ---------- | ------------------- |
| ---------- | ------------------------ |
| PRIMARY | id |
| uri-id-url | UNIQUE, uri-id, url |
| uri-id-url | UNIQUE, uri-id, url(512) |
| uri-id-id | uri-id, id |
Foreign Keys
------------

View File

@ -0,0 +1,30 @@
Table post-question-option
===========
Question option
Fields
------
| Field | Description | Type | Null | Key | Default | Extra |
| ------- | --------------------------------------------------------- | ------------ | ---- | --- | ------- | ----- |
| id | Id of the question | int unsigned | NO | PRI | NULL | |
| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | NO | PRI | NULL | |
| name | Name of the option | varchar(255) | YES | | NULL | |
| replies | Number of replies for this question option | int unsigned | YES | | NULL | |
Indexes
------------
| Name | Fields |
| ------- | ---------- |
| PRIMARY | uri-id, id |
Foreign Keys
------------
| Field | Target Table | Target Field |
|-------|--------------|--------------|
| uri-id | [item-uri](help/database/db_item-uri) | id |
Return to [database documentation](help/database)

View File

@ -0,0 +1,32 @@
Table post-question
===========
Question
Fields
------
| Field | Description | Type | Null | Key | Default | Extra |
| -------- | --------------------------------------------------------- | ------------ | ---- | --- | ------------------- | -------------- |
| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |
| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | NO | | NULL | |
| multiple | Multiple choice | boolean | NO | | 0 | |
| voters | Number of voters for this question | int unsigned | YES | | NULL | |
| end-time | Question end time | datetime | YES | | 0001-01-01 00:00:00 | |
Indexes
------------
| Name | Fields |
| ------- | -------------- |
| PRIMARY | id |
| uri-id | UNIQUE, uri-id |
Foreign Keys
------------
| Field | Target Table | Target Field |
|-------|--------------|--------------|
| uri-id | [item-uri](help/database/db_item-uri) | id |
Return to [database documentation](help/database)

View File

@ -7,8 +7,9 @@ Fields
------
| Field | Description | Type | Null | Key | Default | Extra |
| ------------ | ------------------------------------------------------------------------------------------------------- | ------------------ | ---- | --- | ------------------- | ----- |
| --------------- | ------------------------------------------------------------------------------------------------------- | ------------------ | ---- | --- | ------------------- | ----- |
| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | NO | PRI | NULL | |
| conversation-id | Id of the item-uri table entry that contains the conversation uri | int unsigned | YES | | NULL | |
| owner-id | Item owner | int unsigned | NO | | 0 | |
| author-id | Item author | int unsigned | NO | | 0 | |
| causer-id | Link to the contact table with uid=0 of the contact that caused the item creation | int unsigned | YES | | NULL | |
@ -18,7 +19,7 @@ Fields
| changed | Date that something in the conversation changed, indicating clients should fetch the conversation again | datetime | NO | | 0001-01-01 00:00:00 | |
| commented | | datetime | NO | | 0001-01-01 00:00:00 | |
| uid | Owner id which owns this copy of the item | mediumint unsigned | NO | PRI | 0 | |
| pinned | The thread is pinned on the profile page | boolean | NO | | 0 | |
| pinned | deprecated | boolean | NO | | 0 | |
| starred | | boolean | NO | | 0 | |
| ignored | Ignore updates for this thread | boolean | NO | | 0 | |
| wall | This item was posted to the wall of uid | boolean | NO | | 0 | |
@ -39,6 +40,7 @@ Indexes
| ----------------- | ------------------- |
| PRIMARY | uid, uri-id |
| uri-id | uri-id |
| conversation-id | conversation-id |
| owner-id | owner-id |
| author-id | author-id |
| causer-id | causer-id |
@ -49,7 +51,6 @@ Indexes
| commented | commented |
| uid_received | uid, received |
| uid_wall_received | uid, wall, received |
| uid_pinned | uid, pinned |
| uid_commented | uid, commented |
| uid_starred | uid, starred |
| uid_mention | uid, mention |
@ -60,6 +61,7 @@ Foreign Keys
| Field | Target Table | Target Field |
|-------|--------------|--------------|
| uri-id | [item-uri](help/database/db_item-uri) | id |
| conversation-id | [item-uri](help/database/db_item-uri) | id |
| owner-id | [contact](help/database/db_contact) | id |
| author-id | [contact](help/database/db_contact) | id |
| causer-id | [contact](help/database/db_contact) | id |

View File

@ -7,8 +7,9 @@ Fields
------
| Field | Description | Type | Null | Key | Default | Extra |
| --------- | ------------------------------------------------------------------------------------------------------- | ------------ | ---- | --- | ------------------- | ----- |
| --------------- | ------------------------------------------------------------------------------------------------------- | ------------ | ---- | --- | ------------------- | ----- |
| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | NO | PRI | NULL | |
| conversation-id | Id of the item-uri table entry that contains the conversation uri | int unsigned | YES | | NULL | |
| owner-id | Item owner | int unsigned | NO | | 0 | |
| author-id | Item author | int unsigned | NO | | 0 | |
| causer-id | Link to the contact table with uid=0 of the contact that caused the item creation | int unsigned | YES | | NULL | |
@ -22,8 +23,9 @@ Indexes
------------
| Name | Fields |
| --------- | --------- |
| --------------- | --------------- |
| PRIMARY | uri-id |
| conversation-id | conversation-id |
| owner-id | owner-id |
| author-id | author-id |
| causer-id | causer-id |
@ -36,6 +38,7 @@ Foreign Keys
| Field | Target Table | Target Field |
|-------|--------------|--------------|
| uri-id | [item-uri](help/database/db_item-uri) | id |
| conversation-id | [item-uri](help/database/db_item-uri) | id |
| owner-id | [contact](help/database/db_contact) | id |
| author-id | [contact](help/database/db_contact) | id |
| causer-id | [contact](help/database/db_contact) | id |

View File

@ -10,7 +10,7 @@ Fields
| ----------------- | --------------------------------------------------------- | ------------------ | ---- | --- | ------- | ----- |
| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | NO | PRI | NULL | |
| uid | Owner id which owns this copy of the item | mediumint unsigned | NO | PRI | NULL | |
| notification-type | | tinyint unsigned | NO | | 0 | |
| notification-type | | smallint unsigned | NO | | 0 | |
Indexes
------------

View File

@ -60,6 +60,7 @@ Indexes
| author-id_uid | author-id, uid |
| author-id_received | author-id, received |
| parent-uri-id_uid | parent-uri-id, uid |
| uid_wall_received | uid, wall, received |
| uid_contactid | uid, contact-id |
| uid_unseen_contactid | uid, unseen, contact-id |
| uid_unseen | uid, unseen |

View File

@ -47,8 +47,8 @@ Fields
| homepage | | varchar(255) | NO | | | |
| xmpp | XMPP address | varchar(255) | NO | | | |
| matrix | Matrix address | varchar(255) | NO | | | |
| photo | | varchar(255) | NO | | | |
| thumb | | varchar(255) | NO | | | |
| photo | | varbinary(383) | NO | | | |
| thumb | | varbinary(383) | NO | | | |
| publish | publish default profile in local directory | boolean | NO | | 0 | |
| net-publish | publish profile in global directory | boolean | NO | | 0 | |

View File

@ -10,7 +10,7 @@ Fields
| ------------ | --------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- |
| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |
| uid | User id | mediumint unsigned | NO | | 0 | |
| callback_url | | varchar(255) | NO | | | |
| callback_url | | varbinary(383) | NO | | | |
| topic | | varchar(255) | NO | | | |
| nickname | | varchar(255) | NO | | | |
| push | Retrial counter | tinyint | NO | | 0 | |

View File

@ -9,7 +9,7 @@ Fields
| Field | Description | Type | Null | Key | Default | Extra |
| -------- | ------------- | ------------------ | ---- | --- | ------------------- | -------------- |
| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |
| hash | | varchar(255) | NO | | | |
| hash | | varbinary(255) | NO | | | |
| created | | datetime | NO | | 0001-01-01 00:00:00 | |
| uid | User id | mediumint unsigned | NO | | 0 | |
| password | | varchar(255) | NO | | | |

View File

@ -7,10 +7,11 @@ Fields
------
| Field | Description | Type | Null | Key | Default | Extra |
| ----- | ----------- | -------------- | ---- | --- | ------- | -------------- |
| ----- | ----------------------------------------------------------------------------- | ---------------- | ---- | --- | ------- | -------------- |
| id | | int unsigned | NO | PRI | NULL | auto_increment |
| name | | varchar(96) | NO | | | |
| url | | varbinary(255) | NO | | | |
| url | | varbinary(383) | NO | | | |
| type | Type of the tag (Unknown, General Collection, Follower Collection or Account) | tinyint unsigned | YES | | NULL | |
Indexes
------------

View File

@ -15,6 +15,7 @@ Fields
| ignored | Posts from this contact are ignored | boolean | YES | | NULL | |
| collapsed | Posts from this contact are collapsed | boolean | YES | | NULL | |
| hidden | This contact is hidden from the others | boolean | YES | | NULL | |
| is-blocked | User is blocked by this contact | boolean | YES | | NULL | |
| pending | | boolean | YES | | NULL | |
| rel | The kind of the relation between the user and the contact | tinyint unsigned | YES | | NULL | |
| info | | mediumtext | YES | | NULL | |
@ -23,7 +24,7 @@ Fields
| fetch_further_information | | tinyint unsigned | YES | | NULL | |
| ffi_keyword_denylist | | text | YES | | NULL | |
| subhub | | boolean | YES | | NULL | |
| hub-verify | | varchar(255) | YES | | NULL | |
| hub-verify | | varbinary(383) | YES | | NULL | |
| protocol | Protocol of the contact | char(4) | YES | | NULL | |
| rating | Automatically detected feed poll frequency | tinyint | YES | | NULL | |
| priority | Feed poll priority | tinyint unsigned | YES | | NULL | |

View File

@ -106,12 +106,6 @@ Derzeitige Hooks
$b ist das Item-Array einer Information, die in der Datenbank und im Item gespeichert ist.
{Bitte beachte: der Seiteninhalt ist bbcode - nicht HTML)
**'settings_form'** - wird aufgerufen, wenn die HTML-Ausgabe für die Einstellungsseite generiert wird.
$b ist die HTML-Ausgabe (String) der Einstellungsseite vor dem finalen "</form>"-Tag.
**'settings_post'** - wird aufgerufen, wenn die Einstellungsseiten geladen werden.
$b ist der $_POST-Array
**'addon_settings'** - wird aufgerufen, wenn die HTML-Ausgabe der Addon-Einstellungsseite generiert wird.
$b ist die HTML-Ausgabe (String) der Addon-Einstellungsseite vor dem finalen "</form>"-Tag.
@ -236,10 +230,6 @@ Eine komplette Liste aller Hook-Callbacks mit den zugehörigen Dateien (am 01-Ap
Hook::callAll('personal_xrd', $arr);
### mod/ping.php
Hook::callAll('network_ping', $arr);
### mod/parse_url.php
Hook::callAll("parse_link", $arr);
@ -271,11 +261,9 @@ Eine komplette Liste aller Hook-Callbacks mit den zugehörigen Dateien (am 01-Ap
Hook::callAll('addon_settings_post', $_POST);
Hook::callAll('connector_settings_post', $_POST);
Hook::callAll('display_settings_post', $_POST);
Hook::callAll('settings_post', $_POST);
Hook::callAll('addon_settings', $settings_addons);
Hook::callAll('connector_settings', $settings_connectors);
Hook::callAll('display_settings', $o);
Hook::callAll('settings_form', $o);
### mod/photos.php
@ -297,10 +285,6 @@ Eine komplette Liste aller Hook-Callbacks mit den zugehörigen Dateien (am 01-Ap
Hook::callAll('home_init', $ret);
Hook::callAll("home_content", $content);
### mod/poke.php
Hook::callAll('post_local_end', $arr);
### mod/contacts.php
Hook::callAll('contact_edit_post', $_POST);
@ -426,6 +410,10 @@ Eine komplette Liste aller Hook-Callbacks mit den zugehörigen Dateien (am 01-Ap
Hook::callAll('storage_instance', $data);
Hook::callAll('storage_config', $data);
### src/Module/Notifications/Ping.php
Hook::callAll('network_ping', $arr);
### src/Module/PermissionTooltip.php
Hook::callAll('lockview_content', $item);
@ -469,10 +457,6 @@ Eine komplette Liste aller Hook-Callbacks mit den zugehörigen Dateien (am 01-Ap
self::callSingle(self::getApp(), 'hook_fork', $fork_hook, $hookdata);
### src/Core/L10n/L10n.php
Hook::callAll('poke_verbs', $arr);
### src/Core/Worker.php
Hook::callAll("proc_run", $arr);

View File

@ -65,17 +65,17 @@ table.bbcodes > * > tr > th {
<td><a href="http://friendi.ca" target="external-link">Friendica</a></td>
</tr>
<tr>
<td>[img]https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.jpg[/img]</td>
<td><img src="https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.jpg" alt="Immagine/foto"></td>
<td>[img]https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.png[/img]</td>
<td><img src="https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.png"></td>
</tr>
<tr>
<td>[img=https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.jpg]Das Friendica Logo[/img]</td>
<td><img src="https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.jpg" alt="Das Friendica Logo"></td>
<td>[img=https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.png]Das Friendica Logo[/img]</td>
<td><img src="https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.png" alt="Das Friendica Logo"></td>
</tr>
<tr>
<td>[img=64x32]https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.jpg[/img]<br>
<td>[img=64x32]https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica.svg[/img]<br>
<br>Note: provided height is simply discarded.</td>
<td><img src="https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.jpg" style="width: 64px;"></td>
<td><img src="https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica.svg" style="width: 64px;"></td>
</tr>
<tr>
<td>[size=xx-small]kleiner Text[/size]</td>

View File

@ -27,7 +27,7 @@ Requirements
* Apache mit einer aktiverten mod-rewrite-Funktion und dem Eintrag "Options All", so dass du die lokale .htaccess-Datei nutzen kannst
* PHP 7.3+ (PHP 8 wird noch nicht komplett unterstützt)
* PHP *Kommandozeilen*-Zugang mit register_argc_argv auf "true" gesetzt in der php.ini-Datei
* Curl, GD, PDO, MySQLi, xml, zip und OpenSSL-Erweiterung
* Curl, GD, GMP, PDO, MySQLi, xml, zip und OpenSSL-Erweiterung
* Das POSIX Modul muss aktiviert sein ([CentOS, RHEL](http://www.bigsoft.co.uk/blog/index.php/2014/12/08/posix-php-commands-not-working-under-centos-7http://www.bigsoft.co.uk/blog/index.php/2014/12/08/posix-php-commands-not-working-under-centos-7) haben dies z.B. deaktiviert)
* Einen E-Mail Server, so dass PHP `mail()` funktioniert.
Wenn kein eigener E-Mail Server zur Verfügung steht, kann alternativ das [phpmailer](https://github.com/friendica/friendica-addons/tree/develop/phpmailer) Addon mit einem externen SMTP Account verwendet werden.

View File

@ -4,7 +4,7 @@
To change the look of friendica you have to touch the themes.
The current default theme is [Vier](https://github.com/friendica/friendica/tree/stable/view/theme/vier) but there are numerous others.
Have a look at [friendica-themes.com](http://friendica-themes.com) for an overview of the existing themes.
Have a look at [github.com/bkil/friendica-themes](https://github.com/bkil/friendica-themes) for an overview of the existing themes.
In case none of them suits your needs, there are several ways to change a theme.
So, how to work on the UI of friendica.

BIN
images/default/corgidon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 35 KiB

BIN
images/default/diaspora.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

@ -0,0 +1,160 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="1000px"
height="1000px"
viewBox="0 0 1000 1000"
version="1.1"
id="SVGRoot"
inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="GoToSocial_icon1.svg"
inkscape:export-xdpi="95.999992"
inkscape:export-ydpi="95.999992">
<defs
id="defs5117">
<inkscape:path-effect
effect="spiro"
id="path-effect5760"
is_visible="true" />
<inkscape:path-effect
effect="spiro"
id="path-effect5756"
is_visible="true" />
<inkscape:path-effect
effect="spiro"
id="path-effect5752"
is_visible="true" />
<inkscape:path-effect
effect="spiro"
id="path-effect5748"
is_visible="true" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.70710678"
inkscape:cx="460.72691"
inkscape:cy="522.20279"
inkscape:document-units="px"
inkscape:current-layer="layer3"
showgrid="false"
inkscape:window-width="1920"
inkscape:window-height="1057"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1" />
<metadata
id="metadata5120">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="background"
inkscape:groupmode="layer"
id="layer1"
style="display:inline">
<rect
style="fill:#d0d0d0;fill-opacity:1;stroke:none;stroke-width:1.51092136;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
id="rect5876"
width="1000.0042"
height="1000"
x="0"
y="0" />
</g>
<g
inkscape:groupmode="layer"
id="layer3"
inkscape:label="sloth"
style="display:inline">
<g
id="g5890"
transform="translate(-10)">
<path
sodipodi:nodetypes="ssscccs"
inkscape:connector-curvature="0"
id="path5762"
d="M 861.29285,497.07031 C 861.65556,665.3247 774.21642,807.40548 511.60027,807.86794 270.63622,808.29226 154.54309,691.2756 155.19024,504.19228 155.7289,348.47535 251.17288,227.4551 422.3176,205.3802 c -35.32036,-75.85452 52.24232,-96.94648 73.77615,-32.00508 13.73451,-37.63439 108.24345,-49.1716 62.21106,24.77055 147.95052,3.75658 302.58353,111.28061 302.98804,298.92464 z"
style="display:inline;fill:#767676;fill-opacity:1;stroke:none;stroke-width:2.57058167;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
<path
sodipodi:nodetypes="sssssss"
inkscape:connector-curvature="0"
id="path5780"
d="m 809.15213,517.31679 c -4.83374,150.52526 -109.85544,235.22815 -297.81171,235.31839 -179.6675,0.0863 -290.56109,-70.98245 -298.50223,-235.31839 -4.6366,-95.95095 54.62861,-181.84442 144.83016,-194.18834 80.92123,-11.07393 99.7402,21.01802 153.67207,21.01802 59.21658,0 83.64871,-35.09608 162.84221,-21.85479 87.78391,14.67763 137.90533,103.6017 134.9695,195.02511 z"
style="display:inline;fill:#e8e8e8;fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
<path
sodipodi:nodetypes="scssscs"
inkscape:connector-curvature="0"
id="path5780-9"
d="m 809.15213,517.31679 c -1.32872,41.37724 -10.22787,77.78081 -26.33906,108.8204 -46.60931,-39.48031 -99.53509,-10.7281 -171.50115,-39.43334 -44.77145,-17.85808 -51.41659,-56.56453 -51.21999,-81.3542 0.54836,-69.14384 48.17003,-93.45758 95.53601,-97.60875 55.74677,-4.88566 124.5246,36.1482 151.01547,66.79433 2.11531,14.01083 2.97167,28.36512 2.50872,42.78156 z"
style="display:inline;fill:#a1a1a1;fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
<ellipse
ry="50.575684"
rx="37.800804"
cy="502.64291"
cx="646.85773"
id="path5816"
style="fill:#767676;fill-opacity:1;stroke:none;stroke-width:1.51185882;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
<path
sodipodi:nodetypes="scssscs"
inkscape:connector-curvature="0"
id="path5780-9-1"
d="m 212.51463,517.3246 c 1.32872,41.37724 10.22787,77.78081 26.33906,108.8204 46.60931,-39.48031 99.57415,-10.73591 171.54021,-39.44115 44.77145,-17.85808 51.41659,-56.56453 51.21999,-81.3542 -0.54836,-69.14384 -48.20909,-93.44977 -95.57507,-97.60094 -55.74677,-4.88566 -124.5246,36.1482 -151.01547,66.79433 -2.11531,14.01083 -2.97167,28.36512 -2.50872,42.78156 z"
style="display:inline;fill:#a1a1a1;fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
<ellipse
transform="scale(-1,1)"
ry="50.575684"
rx="37.800804"
cy="502.64294"
cx="-374.84808"
id="path5816-0"
style="display:inline;fill:#767676;fill-opacity:1;stroke:none;stroke-width:1.51185882;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
<path
sodipodi:nodetypes="sssss"
inkscape:connector-curvature="0"
id="path5862"
d="m 543.96613,556.96185 c 0,11.0622 -14.51648,20.02988 -32.42347,20.02988 -17.90698,0 -32.42347,-8.96769 -32.42347,-20.02988 0,-11.0622 14.14619,-15.58638 32.05318,-15.58638 17.90698,0 32.79376,4.52417 32.79376,15.58638 z"
style="display:inline;fill:#767676;fill-opacity:1;stroke:none;stroke-width:1.60515046;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
<path
sodipodi:nodetypes="sssss"
inkscape:connector-curvature="0"
id="path5865"
d="m 552.00195,620.36132 c 7.06643,13.89391 -19.38375,21.24024 -40.2832,21.24024 -20.89945,0 -47.71708,-7.02219 -41.50391,-21.24024 5.71775,-13.08435 20.11619,0.73243 41.01563,0.73243 20.89944,0 34.43888,-13.1835 40.77148,-0.73243 z"
style="display:inline;fill:#767676;fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
<ellipse
transform="rotate(-6.669407)"
ry="24.882849"
rx="19.511755"
cy="560.95673"
cx="600.24731"
id="path5818"
style="display:inline;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.53898752;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
<ellipse
transform="rotate(-6.6694071)"
ry="24.882849"
rx="19.511755"
cy="529.32086"
cx="329.69714"
id="path5818-8"
style="display:inline;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.53898752;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 7.9 KiB

BIN
images/default/hometown.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
images/default/mastodon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

BIN
images/default/pleroma.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
images/default/plume.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 756 B

After

Width:  |  Height:  |  Size: 270 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 267 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 7.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 608 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.2 KiB

View File

@ -0,0 +1,4 @@
<svg xmlns="http://www.w3.org/2000/svg" width="192" height="192" viewBox="0 0 1920 1920">
<rect fill="#1872a2" width="1920" height="1920"/>
<path fill="#febf19" d="M390 595q0-84 61-145 60-60 144-60h730q85 0 145 60 60 61 60 145v730q0 84-60 145-60 60-145 60H595q-84 0-144-60-60-61-61-145zm935-160h-183v274H778v231l363-2 1 273H778v274h547q67 0 114-47 46-46 45-113V595q0-67-45-113-46-46-114-47z"/>
</svg>

After

Width:  |  Height:  |  Size: 403 B

View File

@ -1 +1,4 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="svg2" width="96" height="96" version="1.1"><defs id="defs4"><linearGradient id="highlightgradient"><stop id="stop3833" offset="0" style="stop-color:#fff;stop-opacity:.74374998"/><stop style="stop-color:#fff;stop-opacity:0" id="stop3829" offset="1"/></linearGradient><linearGradient id="shadowgradient"><stop id="stop3833-5" offset="0" style="stop-color:#000;stop-opacity:.5"/><stop style="stop-color:#818080;stop-opacity:0" id="stop3829-9" offset="1"/></linearGradient><linearGradient id="linearGradient4011" x1="44.948" x2="54.103" y1="0" y2="46.797" gradientTransform="scale(1,0.54545455)" gradientUnits="userSpaceOnUse" xlink:href="#highlightgradient"/><linearGradient id="linearGradient4021" x1="52.017" x2="42.868" y1="96" y2="41.838" gradientTransform="matrix(1,0,0,0.5,0,48)" gradientUnits="userSpaceOnUse" xlink:href="#shadowgradient"/><filter id="filter4055" width="1.06" height="1.24" x="-.03" y="-.12"><feGaussianBlur id="feGaussianBlur4057" stdDeviation="1.2"/></filter><filter id="filter4059" width="1.06" height="1.244" x="-.03" y="-.122"><feGaussianBlur id="feGaussianBlur4061" stdDeviation="1.22"/></filter></defs><metadata id="metadata7"/><g id="layer1" transform="translate(0,-956.3622)" style="display:inline"><path style="fill:#ffc019;fill-opacity:1;stroke:none" id="rect2993" d="M 16,0 C 7.0091019,0.04308252 0,7.0521845 0,16 0,16 0,57.499123 0,80 0,89.120146 7.0091019,96 16,96 L 32,96 32,70 64,70 63.916016,46.068359 32,46.236328 32,26 64,26 64,0 C 64,0 24,0 16,0 z" transform="translate(0,956.3622)"/><path style="fill:#1872a2;fill-opacity:1;stroke:none" id="rect2993-6" d="m 80,1052.3622 c 8.990898,0 16.086165,-6.966 16,-16 0,0 0,-41.4991 0,-64 0.07767,-9.01639 -7.067354,-16 -16,-16 l -16,0 0,26 -32,0 0,22 32,0 0,22 -32,0 0,26 c 0,0 32,0 48,0 z"/></g><g style="display:inline" id="g3997"><path id="path3999" d="m 64,0 0,26 -32,0 0,22 m 32,0 0,22 -32,0 0,26" style="fill:none;stroke:#000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/><rect id="rect4001" width="96" height="96" x="0" y="0" rx="16" ry="16" style="fill:none;stroke:#000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/></g><g id="layer3" style="display:none"><path style="fill:none;stroke:#000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path3926" d="m 64,0 0,26 -32,0 0,22 32,0 0,22 -32,0 0,26"/><rect style="fill:none;stroke:#000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="rect3928" width="96" height="96" x="0" y="0" rx="16" ry="16"/></g><g id="layer2" style="display:inline"><rect style="fill:url(#linearGradient3930);fill-opacity:1;stroke:none" id="rect3823" width="96" height="48.044" x="0" y="0" rx="15.215" ry="15.216"/><rect style="fill:url(#linearGradient3904);fill-opacity:1;stroke:none" id="rect3823-8" width="96" height="47.867" x="0" y="-96" rx="15.215" ry="15.16" transform="scale(1,-1)"/><rect style="fill:url(#linearGradient4011);fill-opacity:1;stroke:none;filter:url(#filter4059)" id="rect4003" width="98" height="24" x="0" y="0" rx="15.215" ry="8.299" transform="matrix(1.0296115,0,0,1.1963836,-2.901924,-4.7132067)"/><rect style="opacity:.56746030000000003;fill:url(#linearGradient4021);fill-opacity:1;stroke:none;filter:url(#filter4055)" id="rect4013" width="96" height="24" x="0" y="72" rx="14.008" ry="12" transform="matrix(0.9768331,0,0,0.91974646,1.1649641,8.098115)"/></g></svg>
<svg xmlns="http://www.w3.org/2000/svg" width="192" height="192" viewBox="0 0 1920 1920">
<rect fill="#1872a2" x="60" y="60" width="1800" height="1800" rx="333"/>
<path fill="#febf19" d="M40 371q0-136 98-234 98-97 234-97h1178q136 0 233 97 97 98 97 234v1178q0 136-97 234-97 97-233 97H372q-137 0-234-97-97-98-98-234Zm1510-258h-296v442H666v373l587-4 1 441H666v442h884q107 0 182-75 75-74 74-183V371q0-108-74-182-74-75-182-76z"/>
</svg>

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 434 B

View File

@ -28,12 +28,14 @@ use Friendica\Content\Nav;
use Friendica\Content\Widget;
use Friendica\Core\Renderer;
use Friendica\Core\Session;
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\Event;
use Friendica\Model\Item;
use Friendica\Model\User;
use Friendica\Module\BaseProfile;
use Friendica\Module\Response;
use Friendica\Network\HTTPException;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Temporal;
@ -216,8 +218,7 @@ function cal_content(App $a)
$events = Event::prepareListForTemplate($r);
if (!empty(DI::args()->getArgv()[2]) && (DI::args()->getArgv()[2] === 'json')) {
echo json_encode($events);
exit();
System::jsonExit($events);
}
// links: array('href', 'text', 'extra css classes', 'title')
@ -253,8 +254,7 @@ function cal_content(App $a)
]);
if (!empty($_GET['id'])) {
echo $o;
exit();
System::httpExit($o);
}
return $o;
@ -289,10 +289,8 @@ function cal_content(App $a)
// If nothing went wrong we can echo the export content
if ($evexport["success"]) {
header('Content-type: text/calendar');
header('content-disposition: attachment; filename="' . DI::l10n()->t('calendar') . '-' . $nick . '.' . $evexport["extension"] . '"');
echo $evexport["content"];
exit();
System::httpExit($evexport["content"], Response::TYPE_BLANK, 'text/calendar');
}
return;

View File

@ -25,6 +25,7 @@ use Friendica\Content\Widget;
use Friendica\Core\Logger;
use Friendica\Core\Renderer;
use Friendica\Core\Session;
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\Contact;
@ -32,10 +33,12 @@ use Friendica\Model\Item;
use Friendica\Model\Post;
use Friendica\Model\User;
use Friendica\Module\ActivityPub\Objects;
use Friendica\Module\Response;
use Friendica\Network\HTTPException;
use Friendica\Protocol\ActivityPub;
use Friendica\Protocol\DFRN;
use Friendica\Protocol\Diaspora;
use Friendica\Util\DateTimeFormat;
function display_init(App $a)
{
@ -99,16 +102,23 @@ function display_init(App $a)
}
if (!empty($_SERVER['HTTP_ACCEPT']) && strstr($_SERVER['HTTP_ACCEPT'], 'application/atom+xml')) {
Logger::info('Directly serving XML for uri-id '.$item['uri-id']);
Logger::debug('Directly serving XML', ['uri-id' => $item['uri-id']]);
displayShowFeed($item['uri-id'], $item['uid'], false);
}
if ($item['gravity'] != GRAVITY_PARENT) {
$parent = Post::selectFirstForUser($item_user, $fields, ['uid' => $item['uid'], 'uri-id' => $item['parent-uri-id']]);
$parent = Post::selectFirstForUser($item_user, $fields, ['uid' => [0, $item_user], 'uri-id' => $item['parent-uri-id']], ['order' => ['uid' => true]]);
$item = $parent ?: $item;
}
DI::page()['aside'] = Widget\VCard::getHTML(display_fetchauthor($item));
$author = display_fetchauthor($item);
if (\Friendica\Util\Network::isLocalLink($author['url'])) {
\Friendica\Model\Profile::load(DI::app(), $author['nick'], false);
} else {
DI::page()['aside'] = Widget\VCard::getHTML($author);
}
$a->setProfileOwner($item['uid']);
}
function display_fetchauthor($item)
@ -150,6 +160,20 @@ function display_content(App $a, $update = false, $update_uid = 0)
}
$parent_uri_id = $item['parent-uri-id'];
}
if (empty($_REQUEST['force'])) {
$browser_update = intval(DI::pConfig()->get($update_uid, 'system', 'update_interval'));
if (!empty($browser_update)) {
$update_date = date(DateTimeFormat::MYSQL, time() - ($browser_update / 500));
if (!Post::exists(["`parent-uri-id` = ? AND `uid` IN (?, ?) AND `received` > ?", $parent_uri_id, 0, $update_uid, $update_date])) {
Logger::debug('No updated content', ['uri-id' => $uri_id, 'uid' => $update_uid, 'updated' => $update_date]);
return '';
} else {
Logger::debug('Updated content found', ['uri-id' => $uri_id, 'uid' => $update_uid, 'updated' => $update_date]);
}
}
} else {
Logger::debug('Forced content update', ['uri-id' => $uri_id, 'uid' => $update_uid]);
}
} else {
$uri_id = ((DI::args()->getArgc() > 2) ? DI::args()->getArgv()[2] : 0);
$parent_uri_id = $uri_id;
@ -278,7 +302,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
// Preparing the meta header
$description = trim(BBCode::toPlaintext($item['body']));
$title = trim(BBCode::toPlaintext($item['title']));
$title = trim(BBCode::toPlaintext($item['title'] ?? ''));
$author_name = $item['author-name'];
$image = DI::baseUrl()->remove($item['author-avatar']);
@ -342,7 +366,6 @@ function displayShowFeed(int $uri_id, int $uid, bool $conversation)
if ($xml == '') {
throw new HTTPException\InternalServerErrorException(DI::l10n()->t('The feed for this item is unavailable.'));
}
header("Content-type: application/atom+xml");
echo $xml;
exit();
System::httpExit($xml, Response::TYPE_ATOM);
}

View File

@ -83,7 +83,7 @@ function editpost_content(App $a)
Hook::callAll('jot_tool', $jotplugins);
$tpl = Renderer::getMarkupTemplate("jot.tpl");
$tpl = Renderer::getMarkupTemplate('jot.tpl');
$o .= Renderer::replaceMacros($tpl, [
'$is_edit' => true,
'$return_path' => '/display/' . $item['guid'],

View File

@ -27,6 +27,7 @@ use Friendica\Core\ACL;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Core\Renderer;
use Friendica\Core\System;
use Friendica\Core\Theme;
use Friendica\Core\Worker;
use Friendica\Database\DBA;
@ -122,8 +123,7 @@ function events_post(App $a)
if (strcmp($finish, $start) < 0 && !$nofinish) {
notice(DI::l10n()->t('Event can not end before it has started.'));
if (intval($_REQUEST['preview'])) {
echo DI::l10n()->t('Event can not end before it has started.');
exit();
System::httpExit(DI::l10n()->t('Event can not end before it has started.'));
}
DI::baseUrl()->redirect($onerror_path);
}
@ -131,8 +131,7 @@ function events_post(App $a)
if (!$summary || ($start === DBA::NULL_DATETIME)) {
notice(DI::l10n()->t('Event title and start time are required.'));
if (intval($_REQUEST['preview'])) {
echo DI::l10n()->t('Event title and start time are required.');
exit();
System::httpExit(DI::l10n()->t('Event title and start time are required.'));
}
DI::baseUrl()->redirect($onerror_path);
}
@ -192,9 +191,7 @@ function events_post(App $a)
$datarray['id'] = $event_id;
if (intval($_REQUEST['preview'])) {
$html = Event::getHTML($datarray);
echo $html;
exit();
System::httpExit(Event::getHTML($datarray));
}
$event_id = Event::store($datarray);
@ -391,8 +388,7 @@ function events_content(App $a)
]);
if (!empty($_GET['id'])) {
echo $o;
exit();
System::httpExit($o);
}
return $o;

View File

@ -24,6 +24,7 @@
use Friendica\App;
use Friendica\Core\Renderer;
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\Photo;
@ -38,15 +39,15 @@ use Friendica\Util\Strings;
function fbrowser_content(App $a)
{
if (!local_user()) {
exit();
System::exit();
}
if (DI::args()->getArgc() == 1) {
exit();
System::exit();
}
// Needed to match the correct template in a module that uses a different theme than the user/site/default
$theme = Strings::sanitizeFilePathItem($_GET['theme'] ?? null);
$theme = Strings::sanitizeFilePathItem($_GET['theme'] ?? '');
if ($theme && is_file("view/theme/$theme/config.php")) {
$a->setCurrentTheme($theme);
}
@ -102,7 +103,8 @@ function fbrowser_content(App $a)
return [
DI::baseUrl() . '/photos/' . $a->getLoggedInUserNickname() . '/image/' . $rr['resource-id'],
$filename_e,
DI::baseUrl() . '/photo/' . $rr['resource-id'] . '-' . $scale . '.'. $ext
DI::baseUrl() . '/photo/' . $rr['resource-id'] . '-' . $scale . '.'. $ext,
$rr['desc']
];
}
$files = array_map("_map_files1", $r);
@ -153,7 +155,6 @@ function fbrowser_content(App $a)
if (!empty($_GET['mode'])) {
return $o;
} else {
echo $o;
exit();
System::httpExit($o);
}
}

View File

@ -36,14 +36,12 @@ use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Core\Session;
use Friendica\Core\System;
use Friendica\Core\Worker;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\Attach;
use Friendica\Model\Contact;
use Friendica\Model\Conversation;
use Friendica\Model\FileTag;
use Friendica\Model\Group;
use Friendica\Model\Item;
use Friendica\Model\ItemURI;
use Friendica\Model\Notification;
@ -57,7 +55,6 @@ use Friendica\Protocol\Activity;
use Friendica\Security\Security;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\ParseUrl;
use Friendica\Worker\Delivery;
function item_post(App $a) {
if (!Session::isAuthenticated()) {
@ -92,7 +89,7 @@ function item_post(App $a) {
*/
if (!$preview && !empty($_REQUEST['post_id_random'])) {
if (!empty($_SESSION['post-random']) && $_SESSION['post-random'] == $_REQUEST['post_id_random']) {
Logger::info('item post: duplicate post');
Logger::warning('duplicate post');
item_post_return(DI::baseUrl(), $api_source, $return_path);
} else {
$_SESSION['post-random'] = $_REQUEST['post_id_random'];
@ -141,7 +138,7 @@ function item_post(App $a) {
// When commenting on a public post then store the post for the current user
// This enables interaction like starring and saving into folders
if ($toplevel_item['uid'] == 0) {
$stored = Item::storeForUserByUriId($toplevel_item['uri-id'], local_user());
$stored = Item::storeForUserByUriId($toplevel_item['uri-id'], local_user(), ['post-reason' => Item::PR_ACTIVITY]);
Logger::info('Public item stored for user', ['uri-id' => $toplevel_item['uri-id'], 'uid' => $uid, 'stored' => $stored]);
if ($stored) {
$toplevel_item = Post::selectFirst(Item::ITEM_FIELDLIST, ['id' => $stored]);
@ -180,7 +177,7 @@ function item_post(App $a) {
// Now check that valid personal details have been provided
if (!Security::canWriteToUserWall($profile_uid) && !$allow_comment) {
Logger::notice('Permission denied.', ['local' => local_user(), 'profile_uid' => $profile_uid, 'toplevel_item_id' => $toplevel_item_id, 'network' => $toplevel_item['network']]);
Logger::warning('Permission denied.', ['local' => local_user(), 'profile_uid' => $profile_uid, 'toplevel_item_id' => $toplevel_item_id, 'network' => $toplevel_item['network']]);
notice(DI::l10n()->t('Permission denied.'));
if ($return_path) {
DI::baseUrl()->redirect($return_path);
@ -442,8 +439,13 @@ function item_post(App $a) {
// Ensure to only modify attachments that you own
$srch = '<' . intval($contact_id) . '>';
$condition = ['allow_cid' => $srch, 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '',
'id' => $attach];
$condition = [
'allow_cid' => $srch,
'allow_gid' => '',
'deny_cid' => '',
'deny_gid' => '',
'id' => $attach,
];
if (!Attach::exists($condition)) {
continue;
}
@ -523,7 +525,7 @@ function item_post(App $a) {
$origin = $_REQUEST['origin'];
}
$uri = Item::newURI($api_source ? $profile_uid : $uid, $guid);
$uri = Item::newURI($guid);
// Fallback so that we alway have a parent uri
if (!$thr_parent_uri || !$toplevel_item_id) {
@ -544,11 +546,11 @@ function item_post(App $a) {
$datarray['author-link'] = $author['url'];
$datarray['author-avatar'] = $author['thumb'];
$datarray['author-id'] = Contact::getIdForURL($datarray['author-link']);
$datarray['created'] = DateTimeFormat::utcNow();
$datarray['edited'] = DateTimeFormat::utcNow();
$datarray['commented'] = DateTimeFormat::utcNow();
$datarray['created'] = empty($_REQUEST['created_at']) ? DateTimeFormat::utcNow() : $_REQUEST['created_at'];
$datarray['edited'] = $datarray['created'];
$datarray['commented'] = $datarray['created'];
$datarray['changed'] = $datarray['created'];
$datarray['received'] = DateTimeFormat::utcNow();
$datarray['changed'] = DateTimeFormat::utcNow();
$datarray['extid'] = $extid;
$datarray['guid'] = $guid;
$datarray['uri'] = $uri;
@ -593,24 +595,7 @@ function item_post(App $a) {
$datarray['protocol'] = Conversation::PARCEL_DIRECT;
$datarray['direction'] = Conversation::PUSH;
$conversation = DBA::selectFirst('conversation', ['conversation-uri', 'conversation-href'], ['item-uri' => $datarray['thr-parent']]);
if (DBA::isResult($conversation)) {
if ($conversation['conversation-uri'] != '') {
$datarray['conversation-uri'] = $conversation['conversation-uri'];
}
if ($conversation['conversation-href'] != '') {
$datarray['conversation-href'] = $conversation['conversation-href'];
}
}
if ($orig_post) {
$datarray['edit'] = true;
} else {
// If this was a share, add missing data here
$datarray = Item::addShareDataFromOriginal($datarray);
$datarray['edit'] = false;
}
$datarray['edit'] = $orig_post;
// Check for hashtags in the body and repair or add hashtag links
if ($preview || $orig_post) {
@ -624,6 +609,12 @@ function item_post(App $a) {
$datarray["id"] = -1;
$datarray["uri-id"] = -1;
$datarray["author-network"] = Protocol::DFRN;
$datarray["author-updated"] = '';
$datarray["author-gsid"] = 0;
$datarray["author-uri-id"] = ItemURI::getIdByURI($datarray["author-link"]);
$datarray["owner-updated"] = '';
$datarray["has-media"] = false;
$datarray['body'] = Item::improveSharedDataInBody($datarray);
$o = DI::conversation()->create([array_merge($contact_record, $datarray)], 'search', false, true);
@ -664,23 +655,20 @@ function item_post(App $a) {
}
$datarray['uri-id'] = ItemURI::getIdByURI($datarray['uri']);
$datarray['body'] = Item::improveSharedDataInBody($datarray);
if ($orig_post) {
// Fill the cache field
// This could be done in Item::update as well - but we have to check for the existance of some fields.
Item::putInCache($datarray);
$fields = [
'title' => $datarray['title'],
'body' => $datarray['body'],
'attach' => $datarray['attach'],
'file' => $datarray['file'],
'rendered-html' => $datarray['rendered-html'],
'rendered-hash' => $datarray['rendered-hash'],
'edited' => DateTimeFormat::utcNow(),
'changed' => DateTimeFormat::utcNow()];
'changed' => DateTimeFormat::utcNow()
];
Item::update($fields, ['id' => $post_id]);
Item::updateDisplayCache($datarray['uri-id']);
if ($return_path) {
DI::baseUrl()->redirect($return_path);
@ -762,7 +750,7 @@ function item_post(App $a) {
}
}
Logger::info('post_complete');
Logger::debug('post_complete');
if ($api_source) {
return $post_id;
@ -787,7 +775,7 @@ function item_post_return($baseurl, $api_source, $return_path)
$json['reload'] = $baseurl . '/' . $_REQUEST['jsreload'];
}
Logger::info('post_json', ['json' => $json]);
Logger::debug('post_json', ['json' => $json]);
System::jsonExit($json);
}
@ -873,7 +861,7 @@ function drop_item(int $id, string $return = '')
item_redirect_after_action($item, $return);
} else {
Logger::notice('Permission denied.', ['local' => local_user(), 'uid' => $item['uid'], 'cid' => $contact_id]);
Logger::warning('Permission denied.', ['local' => local_user(), 'uid' => $item['uid'], 'cid' => $contact_id]);
notice(DI::l10n()->t('Permission denied.'));
DI::baseUrl()->redirect('display/' . $item['guid']);
//NOTREACHED

View File

@ -308,7 +308,7 @@ function message_content(App $a)
$body_e = BBCode::convertForUriId($message['uri-id'], $message['body']);
$to_name_e = $message['name'];
$contact = Contact::getByURL($message['from-url'], false, ['thumb', 'addr', 'id', 'avatar']);
$contact = Contact::getByURL($message['from-url'], false, ['thumb', 'addr', 'id', 'avatar', 'url']);
$from_photo = Contact::getThumb($contact);
$mails[] = [
@ -440,7 +440,7 @@ function render_messages(array $msg, $t)
continue;
}
$contact = Contact::getByURL($rr['url'], false, ['thumb', 'addr', 'id', 'avatar']);
$contact = Contact::getByURL($rr['url'], false, ['thumb', 'addr', 'id', 'avatar', 'url']);
$from_photo = Contact::getThumb($contact);
$rslt .= Renderer::replaceMacros($tpl, [

Some files were not shown because too many files have changed in this diff Show More