Commit Graph

7741 Commits

Author SHA1 Message Date
RealKinetix c1db1c980e Fix indent to standards 2021-07-14 12:17:03 -07:00
RealKinetix 2ebebe9abc Sanitize negative followers count on APContact
Please see
https://github.com/friendica/friendica/issues/9498#issuecomment-818894106
and related discussion regarding this - it appears it's possible for AP
users, maybe just Mastodon users, to have a negative followers count.
This causes fatal errors in Friendica, so I think we should sanitize
this input.
2021-07-14 10:15:19 -07:00
Hypolite Petovan fd37a57678
Merge pull request #10496 from annando/subscribe
Subscribe to contacts from a remote AP account
2021-07-14 06:45:25 -04:00
Hypolite Petovan be18a59bd7 Make last status parameter actually optional in Object\Api\Mastodon\Conversation 2021-07-13 23:02:11 -04:00
Michael 0277589fbd Removed experimental code 2021-07-14 02:59:29 +00:00
Michael 6fceab0cc8 Merge remote-tracking branch 'upstream/develop' into subscribe 2021-07-14 02:54:12 +00:00
Hypolite Petovan 2b5f1f8bca
Merge pull request #10493 from annando/api
Improve how shared posting look on mobile apps
2021-07-13 22:48:31 -04:00
Michael 5526421607 Issue 10491: Possibility for simple shortening added 2021-07-13 22:37:22 -04:00
Michael b4e4378568 Merge remote-tracking branch 'upstream/develop' into api 2021-07-14 02:28:37 +00:00
Hypolite Petovan 999a394b4d
Merge pull request #10490 from annando/fatal
Fix Uncaught TypeError: Argument 1 passed to Friendica\Model\Item::storeForUserByUriId()
2021-07-13 21:01:53 -04:00
Michael ff8f350a42 Change the BBCode version 2021-07-13 20:37:06 +00:00
Michael 875a6b81ef Improve links for API 2021-07-13 14:40:10 +00:00
Michael 267b652857 Improve how shared posting look on mobile apps 2021-07-13 08:30:05 +00:00
Michael 1466afe3b2 Automatically subscribe to the followings of a given AP account 2021-07-13 06:06:08 +00:00
Michael 299cff8c50 Defining return value 2021-07-12 20:06:35 +00:00
Michael aee652117c Definiing parameter type 2021-07-12 14:28:13 +00:00
Michael e5c312a066 Issue 10491: Possibility for simple shortening added 2021-07-12 14:11:51 +00:00
Michael 002df6e8d1 Fix Uncaught TypeError: Argument 1 passed to Friendica\Model\Item::storeForUserByUriId() 2021-07-12 07:02:01 +00:00
Michael e151a2dc41 Fixes "Undefined index: nick" 2021-07-12 06:25:48 +00:00
Michael 219534e88c Accepting "null" as parameter value 2021-07-11 14:37:17 +00:00
Michael 7390791d21 Avoid problems with "null" values 2021-07-11 11:11:03 +00:00
Michael d267ba999c We now use the new account-user-view (and fixed the function name) 2021-07-11 09:39:34 +00:00
Michael b46b88cc10 Fix fatal error 2021-07-10 21:08:55 +00:00
Michael 07d2dfcd60 Some more "convertForUriId" replacements 2021-07-10 12:58:48 +00:00
Michael 161fa4a795 Post update: Set "uri-id" in the contact tables 2021-07-10 01:41:26 +00:00
Michael de39091a79 Revert some test changes 2021-07-09 19:32:06 +00:00
Michael 90897f36ca Fix notices because of unknown Hubzilla activity type 2021-07-09 19:30:41 +00:00
Michael d6c1e1fd1c Fix "Undefined index: reply-to-id" 2021-07-09 18:10:48 +00:00
Michael e0fdde3287 Fix the tests, hopefully 2021-07-09 17:13:54 +00:00
Michael 04580ad4fb Don't update automatically to make tests happy 2021-07-09 16:20:22 +00:00
Michael 0735a22cdd Fix notice "undefined index: uri" 2021-07-09 14:52:22 +00:00
Michael 9ac284ec3a Update on empty uri-id 2021-07-09 08:46:42 +00:00
Michael b50a92cf7a Contact tables added to expire function 2021-07-09 08:08:48 +00:00
Michael 6e79da0b0c The uri-id is now in all contact tables 2021-07-09 07:09:33 +00:00
Michael c63d3f4604 Fix tests 2021-07-09 06:37:45 +00:00
Michael d8974c9a2a Function renamed to better reflect the functionality 2021-07-09 06:29:24 +00:00
Michael 17ae9b71af Avoid error on empty content 2021-07-09 04:42:01 +00:00
Michael 88f147c6a7 Always update on missing uri-id, check for uri-id in contact before removal 2021-07-09 04:38:36 +00:00
Michael 377bb78cc2 Set "convertForItem" at more places 2021-07-08 20:01:52 +00:00
Michael 901c3f4855 we now have got an uri-id field for the contact table 2021-07-08 18:59:58 +00:00
Michael 178bc543e3 New founction to count threads 2021-07-08 17:32:41 +00:00
Michael c972cce740 Avoid notice 2021-07-08 16:38:02 +00:00
Michael e72e74f7db Fixed function name 2021-07-08 15:44:55 +00:00
Michael 165c6ddc63 "convert" changed to "convertForItem" 2021-07-08 15:41:46 +00:00
Michael f29bd23ea8 New function to convert BBCode for a given ID 2021-07-08 13:47:46 +00:00
Michael f3452d86c4 Improved logging, improved link check 2021-07-06 17:40:40 +00:00
Michael ecf0b67d9d Just look at HTTP links 2021-07-06 16:10:10 +00:00
Michael 234bdff7ab Improved link check 2021-07-06 15:06:15 +00:00
Michael 37a76e70ef Providing the uri-id to "convert" when possible 2021-07-06 12:34:48 +00:00
Michael 098cd543ea Cleaned code for contact avatars 2021-07-06 10:36:00 +00:00
Michael d0136222e7 Further simplification 2021-07-06 09:24:25 +00:00
Michael 12173df4d3 Replace proxy function 2021-07-06 09:22:41 +00:00
Michael 8bfa15cf23 Simplify the attachment handling 2021-07-06 08:57:49 +00:00
Michael b7a4ef0ec1 Modfy links for attachments 2021-07-06 08:40:59 +00:00
Michael 93309a3728 Quit on empty uri-id 2021-07-06 06:45:53 +00:00
Michael dac27ead7a Proxy settings removed 2021-07-06 06:44:18 +00:00
Michael cdc18387fd Use the uri-id directly in the bbcode converter 2021-07-06 05:25:30 +00:00
Michael f8ce59b411 Use the post uri-id for false reshares 2021-07-06 04:36:45 +00:00
Michael 3deb384c54 Replace the proxify function 2021-07-05 21:35:57 +00:00
Michael db90e3bf25 Remove attachment on plaintext conversion 2021-07-05 20:20:39 +00:00
Michael 903c646a62 Style 2021-07-05 19:42:17 +00:00
Michael aed5e4cc96 New struture for post related links 2021-07-05 18:45:49 +00:00
Michael 90588ddb8e Avoid proxyfying images that are removed or replaced later 2021-07-05 07:00:35 +00:00
Michael a5176cb841 Unused constant removed 2021-07-05 05:41:05 +00:00
Michael fccb725651 Unneeded workaround removed 2021-07-05 05:11:35 +00:00
Michael a06d699480 Item cache related functionality removed 2021-07-05 04:57:50 +00:00
Michael 844727dc19 Simplyfying code 2021-07-05 04:16:02 +00:00
Michael 7188ed745c Merge remote-tracking branch 'upstream/develop' into proxy 2021-07-05 03:44:15 +00:00
Michael b09f555f4f Merge remote-tracking branch 'upstream/develop' into notice 2021-07-05 03:03:41 +00:00
Michael 1b6d0f8b1f Fix notice "Undefined index: account-type" 2021-07-04 21:26:08 +00:00
Michael e519b782fd Simplified proxy handling 2021-07-04 21:24:49 +00:00
Michael dfc1b1e7a5 Allow search for only locally published contacts 2021-07-04 19:58:02 +00:00
Tobias Diekershoff 2b95a7e7cd Merge branch 'stable' into develop 2021-07-04 20:52:22 +02:00
Michael f0268b57be Use "getOwnerDataById" and "getOwnerDataByNick" to fetch owner data 2021-07-04 17:25:08 +00:00
Hypolite Petovan 638723ea1c
Merge pull request #10466 from annando/local-follow
Ensure that the network is set for "self" contacts
2021-07-04 12:21:21 -04:00
Michael 582fd613e0 Ensure that the network is set for "self" contac ts 2021-07-04 14:17:10 +00:00
Hypolite Petovan b84c68f024
Merge pull request #10465 from annando/local-follow
Fix local follow (and local contact data update)
2021-07-04 10:15:10 -04:00
Hypolite Petovan bedc8e1427
Merge pull request #10463 from annando/proxy-security
Proxy: Avoid access for not logged in users
2021-07-04 10:12:36 -04:00
Hypolite Petovan c0579bcad9
Merge pull request #10462 from annando/duplicate-avatars
Removal of duplicated photo entries for a contact
2021-07-04 09:56:47 -04:00
Michael 74a0bfc6da Ensure to not update the "self" contact 2021-07-04 12:38:35 +00:00
Michael 87cc17337b Fix local follow (and local contact data update) 2021-07-04 12:35:48 +00:00
Michael 24f013a654 Redirecting not logged in user instead of failing 2021-07-04 11:53:49 +00:00
Michael 4f6be0bd03 Function only needs to be private 2021-07-04 10:59:24 +00:00
Michael da484a48e3 Proxy: Avoid access for not logged in users 2021-07-04 10:55:32 +00:00
Michael 47904f99c2 Removal of duplicated photo entries for a contact 2021-07-04 10:40:03 +00:00
Michael 5ee0f6e5e1 Transmit preview link 2021-07-04 06:30:54 +00:00
Michael 1da6fa0043 Issue 10352: Fixing photo entries for contact avatars 2021-07-03 20:43:00 +00:00
Michael f37e808e02 Fix test 2021-07-03 15:47:11 +00:00
Michael c72abe48a8 Fixed fetching private local images 2021-07-03 15:29:27 +00:00
Michael 9cf39dbf00 Quickfix for hashtags in usernames in shared posts 2021-07-02 04:34:49 +00:00
Michael 8e9433f2e9 Fix: Fetching of non public photos 2021-07-01 18:05:54 +00:00
Hypolite Petovan c63dfa38c1
Merge pull request #10451 from annando/contact-path
Some more places changed to the new contact avatar path format
2021-06-30 21:24:27 -04:00
Hypolite Petovan 7a2038fc93
Merge pull request #10452 from annando/notice
Avoid Notice: Undefined index: field1 in /src/Module/Register.php on line 253
2021-06-30 21:23:12 -04:00
Hypolite Petovan dfd711d111
Merge pull request #10450 from annando/discoverable
AP: Support "discoverable"
2021-06-30 21:16:11 -04:00
Michael 16de3454bc Change logo path 2021-06-30 20:00:57 +00:00
Michael b46ad72651 Fix media size 2021-06-30 19:55:28 +00:00
Michael df9a69db01 Avoid Notice: Undefined index: field1 in /src/Module/Register.php on line 253 2021-06-30 19:13:27 +00:00
Michael 98dd4e889a Some more contact paths 2021-06-30 18:44:41 +00:00
Michael 09aa496387 Some more places changed to the new contact avatar path format 2021-06-30 16:58:46 +00:00
Michael e2dc36a691 AP: Support "discoverable" 2021-06-30 05:40:11 +00:00
Michael ec49afa116 Guess the mimetype in advance 2021-06-30 04:28:03 +00:00
Michael 39fe60744b Grammar 2021-06-30 03:49:43 +00:00
Michael d2b32a151e Detect the mimetype for external resources 2021-06-30 03:47:53 +00:00
Michael 19aef93560 Unified avatar paths 2021-06-29 20:26:58 +00:00
Michael 9edc75e29d Improved avatar handling (timestamps for caching) 2021-06-29 06:15:45 +00:00
Michael ebb9e0c2f5 Fix resizing 2021-06-28 19:38:03 +00:00
Michael ffdbac7e41 Issue 10443: Fix requesting media content 2021-06-28 18:53:10 +00:00
Michael 2f06d271bb Use a default value for "uid" 2021-06-28 13:58:06 +00:00
Michael a1a584f444 External resources are cacheable 2021-06-28 13:09:00 +00:00
Michael 4f95622d73 Only user the user with attached media. 2021-06-28 12:40:58 +00:00
Michael 8ac9b37176 Merge remote-tracking branch 'upstream/2021.06-rc' into proxy2 2021-06-28 10:11:41 +00:00
Michael 6f350c1e59 Use signed requests for fetching private images 2021-06-28 10:08:51 +00:00
Michael 7e200174d6 Replace attachment links in the body 2021-06-28 04:53:20 +00:00
Hypolite Petovan 681c7c0187 Add ExternalStorage dependency to StorageManager
- Since ExternalStorage isn't instantiated automatically by Dice, we have to provide the dependency manually in StorageManager->getByName
- This requires StorageManager to take one one additional dependency
- Tests are updated with this additional dependency
2021-06-27 23:15:46 -04:00
Hypolite Petovan faac5b71ce
Merge pull request #10437 from annando/reduce-proxy
Reduce the usage of the "proxifyUrl" function
2021-06-27 22:41:14 -04:00
Michael dbf9132ea6 Fixed indendation 2021-06-28 01:34:29 +00:00
Hypolite Petovan 005ba8c388
Merge pull request #10435 from nupplaphil/feat/di_cleanup
Add constructor injection for ExternalResource Storage
2021-06-27 21:02:03 -04:00
Michael c89547aead Only proxify images 2021-06-27 19:06:05 +00:00
Michael b46b7b08ba Reduce the usage of the "proxifyUrl" function 2021-06-27 11:50:10 +00:00
Philipp Holzer b5acc07eaf
Add todo for develop phase 2021-06-26 21:17:10 +02:00
Michael de2898988b Inverted condition 2021-06-26 11:31:37 +00:00
Michael 258d5fa695 Issue 10433: Only notify when there had been changes 2021-06-26 11:29:58 +00:00
Philipp Holzer f1f3fa7216
Add constructor injection for ExternalResource 2021-06-25 20:13:50 +02:00
Michael Vogel d9d30d9555
Apply suggestions from code review
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2021-06-25 20:00:59 +02:00
Michael ed4a18f079 Function to return the avatar and header path for a given contact id 2021-06-25 17:03:35 +00:00
Michael e6e90abc77 AOI: Send "history" section for trends 2021-06-24 22:15:25 +00:00
Michael 89608d5844 Set CORS header fields to support Halcyon 2021-06-24 18:02:29 +00:00
Michael ee25246e41 Standards 2021-06-24 17:37:50 +00:00
Michael 9276f6823b New class for external resources 2021-06-24 17:30:22 +00:00
Michael 96809b3fdd API: Improved avatar handling 2021-06-24 07:08:38 +00:00
Tobias Diekershoff cfc08cbc11 console autoinstall used parameter U twice
The parameter "-U" was used twice for the database user and for the URL.
As all other database parameters are using the lowercase letter for the
parameter, this was adopted for the dbuser as well.
2021-06-23 18:05:39 +02:00
Michael df05d6b52a Transmit mediaType for headers as well / use blank image for empty header 2021-06-22 13:58:29 +00:00
Michael dd39b3203b Transmit mediaType, preparation for header image 2021-06-22 03:17:41 +00:00
Hypolite Petovan 47cb89967f
Merge pull request #10420 from annando/usercount
Don't count the system user as user
2021-06-21 08:46:56 -04:00
Michael 6b46fdb54e Don't count the system user as user 2021-06-21 04:03:20 +00:00
Michael d5e5a6ea23 Fix fatal error: Uncaught TypeError: Argument 1 passed to Friendica\Model\Post\Media::existsByURIId() must be of the type int, null given 2021-06-21 03:53:53 +00:00
Philipp Holzer 5a6c5e9a17
Fix wrong attachement index 2021-06-20 22:33:05 +02:00
Philipp Holzer d4387d45ee
Cleanup Code 2021-06-20 13:25:45 +02:00
Philipp Holzer 263774eb46
Satisfy PHP-CS 2021-06-20 13:25:45 +02:00
Philipp Holzer 322f0b3ecf
Cleanup Mastodon Factories 2021-06-20 13:25:45 +02:00
Michael 97891fe05b Context: use the correct "select functionality 2021-06-19 18:27:35 +00:00
Michael 7dd5ea42e9 An empty user id does not have children 2021-06-19 06:27:25 +00:00
Michael 09609c40a4 Classname fixed 2021-06-18 05:50:52 +00:00
Michael 7d835ad790 Unused "use" removed 2021-06-18 03:32:20 +00:00
Michael 0a5904a001 API: "created_at" is timestamp 2021-06-18 03:21:38 +00:00
Michael a2b1819721 Fix notice "Undefined index: url in .../src/Protocol/ActivityPub/Transmitter.php on line 611" 2021-06-17 18:48:23 +00:00
Michael Vogel b184df1108
Update src/Object/Api/Mastodon/Account.php
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2021-06-17 19:14:35 +02:00
Michael bd016dc680 Photos should point to the local system 2021-06-17 16:55:54 +00:00
Michael fe07dc828b Fix noscrape publishing and pulling, added header 2021-06-17 11:23:32 +00:00
Michael ebd4f59d02 Merge remote-tracking branch 'upstream/2021.06-rc' into public-timeline 2021-06-16 21:01:20 +00:00
Hypolite Petovan 7b91bd1d80
Merge pull request #10410 from annando/oauth
API: Added OAuth revoke, adding documentation to parameters
2021-06-16 16:32:45 -04:00
Michael Vogel a256f18159
Update src/Module/OAuth/Token.php
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2021-06-16 22:19:26 +02:00
Hypolite Petovan 59204d641d
Merge pull request #10409 from annando/api-link-header
Set the "Link" header
2021-06-16 16:16:35 -04:00
Michael 6b3476409a Check for REDIRECT_REMOTE_USER as well 2021-06-16 19:39:51 +00:00
Michael 5e22704f7e API: Added OAuth revoke, adding documentation to parameters 2021-06-16 19:24:44 +00:00
Michael 6e789ec19a No need for +1 and -1 2021-06-16 17:57:01 +00:00
Hypolite Petovan ead0cf370a
Merge pull request #10408 from annando/issue-10392
Issue 10392: Avoid "Friendica can't display this page at the moment"
2021-06-16 13:32:17 -04:00
Michael 78d4aff878 Set the "Link" header 2021-06-16 15:02:33 +00:00
Michael ae5f57233e Issue 10392: Avoid "Friendica can't display this page at the moment" 2021-06-16 13:23:07 +00:00
Michael 11d2440425 New functions for the post-view view 2021-06-16 10:16:01 +00:00
Michael 5211c12b0c Merge remote-tracking branch 'upstream/2021.06-rc' into public-timeline 2021-06-16 05:58:11 +00:00
Michael 3796e13142 Force a directory update if previously published 2021-06-16 05:23:43 +00:00
Michael 1ced04e54c Merge remote-tracking branch 'upstream/2021.06-rc' into profile-publish 2021-06-16 05:01:16 +00:00
Michael c17f23423f Chec for missing profile first 2021-06-15 22:01:30 +00:00
Michael e994d02791 Add a profile entry if missing 2021-06-15 21:39:28 +00:00
Michael 0ab24510ef Centzralized functionality to update and publish profile changes 2021-06-15 11:12:44 +00:00
Michael d348e4afca Possibly fixes notice "Undefined index: private in .../src/Model/Item.php on line 3115" 2021-06-14 18:34:11 +00:00
Hypolite Petovan c9ec2e21b3
Merge pull request #10403 from annando/doc-structure
Updated database structure documentation
2021-06-14 09:01:58 -04:00
Michael 7106106f11 Formatted index list 2021-06-14 12:15:10 +00:00
Michael 96f07c7288 Indexes and foreign keys added 2021-06-14 08:53:37 +00:00
Michael fd30df7300 Pad the header 2021-06-14 05:58:51 +00:00
Michael 4095e6c9be Pad the lengths of the columns 2021-06-14 05:33:47 +00:00
Michael a827f948c8 Reversed "null" 2021-06-14 05:14:09 +00:00
Michael 31db9dbef7 Added default value "NULL" 2021-06-14 05:08:01 +00:00
Michael bb5e6d248b Added sort order 2021-06-13 20:56:14 +00:00
Michael 84ab5d6159 Updates database structure documentation 2021-06-13 20:33:50 +00:00
Michael bf8cb39102 Diaspora relay functionality is removed 2021-06-13 11:15:04 +00:00
Simon Rupf 8b841ccc51 Reduce batch size for photo processing to reduce memory usage 2021-06-12 20:40:17 +02:00
Michael 24cc82f396 API: (hopefully) improves speed of the public timeline 2021-06-12 15:19:56 +00:00
Michael b7f12051a8 Small fixes 2021-06-12 11:19:23 +00:00
Michael c21cbd936e Changed sorting 2021-06-12 10:12:02 +00:00
Michael b8da971fac Server statistics: New section for relais and nomads 2021-06-12 08:08:35 +00:00
Michael 84028d7342 Proxify the media url 2021-06-11 03:51:11 +00:00
Michael 4ea30af752 Videos are now working as well 2021-06-10 19:55:43 +00:00
Michael 945f482ba3 API: Some more apps are now supported 2021-06-10 19:10:33 +00:00
Michael 6dc2988c0f Return the application fields 2021-06-10 08:05:21 +00:00
Michael 0b9c934cad Simplify the code 2021-06-10 07:02:06 +00:00
Michael d917ed58a8 API: Tests with various clients, small fixes 2021-06-10 06:26:34 +00:00
Michael 5e36d10730 Merge remote-tracking branch 'upstream/2021.06-rc' into http-options 2021-06-09 11:11:11 +00:00
Michael 4706d60b04 Added documentation 2021-06-09 07:44:19 +00:00
Michael c9b66d6e28 Deactivate CORS related headers 2021-06-09 07:42:23 +00:00
Michael 58a513cb30 Support HTTP OPTIONS requests 2021-06-09 07:27:42 +00:00
Michael 385c03364f The function is now protected again 2021-06-08 20:45:58 +00:00
Michael e4be1e0cd5 Get rid of "api_user()" function 2021-06-08 20:41:46 +00:00
Michael 8bf5dd187b Added "source" detection 2021-06-08 17:48:41 +00:00
Michael 0f0a301280 Move basic auth functionality to the new class 2021-06-08 17:32:41 +00:00
Michael 2a440c0bae Use "checkAllowedScope" instead of "login" 2021-06-08 12:00:22 +00:00
Michael 5853fe562d Login hasn't got a return value 2021-06-08 09:51:17 +00:00
Michael 9720ee2c20 Rearranged scope check 2021-06-08 09:11:56 +00:00
Michael 95cac04540 Rearranged function order 2021-06-08 08:56:01 +00:00