friendica/friendica
6
0
Fork 1
mirror of https://github.com/friendica/friendica synced 2024-05-24 04:04:59 +02:00
Code Issues Packages Projects Releases 1 Wiki Activity
35983 commits 2 branches 63 tags 241 MiB
Commit graph

10527 commits

Author SHA1 Message Date
MarekBenjamin d2b23d57e4
Merge branch 'friendica:2022.12-rc' into new_image_presentation 2022-12-12 17:59:42 +01:00
Hank Grabowski 46607598f3 Fix Friendica Photo GET API endpoint to work without explicit scale term 2022-12-12 11:27:59 -05:00
Hypolite Petovan d60c405390
Merge pull request #12393 from annando/api-permissions 
API: Allow permissions for status posts
 2022-12-12 10:20:28 -05:00
Michael Vogel 0209c39e0a
Update src/Module/Api/Twitter/Statuses/Update.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-12-12 15:51:14 +01:00
Hypolite Petovan c8d4b73871
Merge pull request #12391 from annando/issue-12338 
Issue 12338: Use redirect for "about" and "about/more"
 2022-12-12 09:39:12 -05:00
Michael 7dfe517c77 Redirect in a different way 2022-12-12 11:24:20 +00:00
Michael 5312b23f03 Don't send the header 2022-12-12 03:13:24 +00:00
Michael a2f386cd2f Transmit header before creating user list 2022-12-12 02:43:32 +00:00
Michael cfd09663e7 Don't display pending requests 2022-12-12 02:33:57 +00:00
Michael 89efa73195 Fix tests 2022-12-11 22:56:56 +00:00
Michael d05910a6e5 API: Allow permissions for status posts 2022-12-11 22:48:43 +00:00
Michael ff5da9bc71 API: Use "contact" for own relations 2022-12-11 22:26:30 +00:00
MarekBenjamin e4702ed464
Merge branch 'friendica:2022.12-rc' into new_image_presentation 2022-12-11 22:25:47 +01:00
Hypolite Petovan baf2f7565a
Merge pull request #12390 from annando/fixes 
Only reshare the author's posts on `MIRROR_NATIVE_RESHARE`
 2022-12-11 15:05:47 -05:00
Hypolite Petovan 0d95535137
Merge pull request #12389 from annando/fatal 
Handle some fatal errors
 2022-12-11 15:04:54 -05:00
Michael afd1dba774 Issue 12338: Use redirect for "about" and "about/more" 2022-12-11 19:50:10 +00:00
Michael 2f3f41ed9c Merge remote-tracking branch 'origin/2022.12-rc' into fixes 2022-12-11 19:00:59 +00:00
Marek Bachmann eb1cfd09a9 added more sophisticated column balancing logic for portraits and landscapes 2022-12-11 18:25:19 +01:00
MarekBenjamin a5aa44f189
Merge branch 'friendica:2022.12-rc' into new_image_presentation 2022-12-11 18:24:27 +01:00
Michael 5d3248d57b Handle some fatal errors 2022-12-11 16:48:36 +00:00
Marek Bachmann 58cc270da8 fixed bug in portrait iteration 
shortened var names

added some comments
 2022-12-11 17:09:28 +01:00
MarekBenjamin 23f31883f5
Merge branch 'friendica:2022.12-rc' into new_image_presentation 2022-12-11 16:56:33 +01:00
Hypolite Petovan a79be5e697 Add Clock classes to deal with "now" times in tests 
- [Composer] Add psr/clock dependency
 2022-12-11 10:12:23 -05:00
Michael Vogel 884a265c5a Some small fixes 2022-12-11 11:21:02 +01:00
Michael 3ce4a1fee4 Avoid error when image couldn't be fetched 2022-12-11 10:12:20 +00:00
Michael bf7df13855 Add more BlurHash to avoid not being able to display some picture 2022-12-11 09:56:30 +00:00
Hypolite Petovan 183e9dc7b2
Merge pull request #12383 from annando/issue-12367 
Issue 12367: Calculate relative date on "date" level instead of "datetime"
 2022-12-10 23:55:05 -05:00
Michael fc1ef084f4 Simplify variable name 2022-12-11 04:16:58 +00:00
Michael 5e176b52a5 Issue 12285: Show sharing notification only once 2022-12-11 04:11:29 +00:00
Michael 62376d2e62 Only calculate the last login on a "date" level 2022-12-11 03:26:45 +00:00
Michael a65aa75234 Issue 12367: Calculate relative date on "date" level instead of "datetime" 2022-12-11 03:24:36 +00:00
MarekBenjamin 1454f3bc2a
Merge branch 'friendica:2022.12-rc' into new_image_presentation 2022-12-10 23:59:51 +01:00
Marek Bachmann fe2c4f7c4b Restored $s = $hook_data['html']; call which was removed on error 2022-12-10 23:47:37 +01:00
Marek Bachmann 412ba461e7 Removed unused imports 2022-12-10 23:45:42 +01:00
Marek Bachmann 2eb170bdbd Added some logic for image grid column balancing 2022-12-10 23:37:03 +01:00
Hypolite Petovan 04945f9c98
Merge pull request #12381 from annando/issue-11875 
Issue 11875: Fetch post on activity
 2022-12-10 17:20:38 -05:00
Marek Bachmann cc048bca38 remove old code 2022-12-10 22:58:43 +01:00
Marek Bachmann d786f225ee Added image grid generation to addVisualAttachments 2022-12-10 22:54:50 +01:00
Michael 1a1e452fae Issue 11875: Fetch post on activity 2022-12-10 21:48:00 +00:00
Michael 539ac4f2b8 Fix "part" calculation for splitted posts 2022-12-10 21:23:21 +00:00
MarekBenjamin c7811576cc
Merge branch 'friendica:2022.12-rc' into new_image_presentation 2022-12-10 22:17:26 +01:00
Hypolite Petovan 106dac5508
Merge pull request #12379 from annando/id-for-image 
ID added for list of images in a post
 2022-12-10 14:46:19 -05:00
Michael 870fd1a52b ID added for list of images in a post 2022-12-10 19:08:56 +00:00
Michael Vogel 46660c9462
Merge pull request #12364 from MrPetovan/bug/warnings 
Address several warning messages
 2022-12-10 18:10:24 +01:00
Michael Vogel 2722ef82cf
Merge pull request #12360 from MrPetovan/bug/deprecated 
Address several Deprecated messages
 2022-12-10 18:08:17 +01:00
Hypolite Petovan 2362e28c40
Merge pull request #12378 from annando/localprobe 
Diaspora added to localprobe
 2022-12-10 11:47:45 -05:00
Hypolite Petovan 71a7f2d503 Remove parameter-less call of OStatus\Salmon module in DFRN\Notify 
- Address https://github.com/friendica/friendica/issues/11993#issuecomment-1342615279
 2022-12-10 11:45:53 -05:00
Hypolite Petovan a71fb8d7f3 Check for existence of a public contact id before deleting related notifications in Model\Contact 
- Address part of https://github.com/friendica/friendica/issues/11993#issuecomment-1338134893
 2022-12-10 11:42:04 -05:00
Hypolite Petovan e78471c847 Throw exception when a few keys are missing from probe data array in Repository\DiasporaContact 
- Address part of https://github.com/friendica/friendica/issues/11993#issuecomment-1338134893
 2022-12-10 11:42:04 -05:00
Hypolite Petovan d87585477c Delete introductions when referenced contact id doesn't exist anymore in Ping module 
- Address part of https://github.com/friendica/friendica/issues/11993#issuecomment-1338134893
 2022-12-10 11:42:03 -05:00
Hypolite Petovan 7aa5407bbd Remove superfluous strlen call in Module\Tos 
- Address https://github.com/friendica/friendica/issues/12011#issuecomment-1342617099
 2022-12-10 11:38:42 -05:00
Hypolite Petovan 607d26e906 Ward against empty JsonLD::fetchElement result in ActivityPub\Receiver::processTags 
- Address https://github.com/friendica/friendica/issues/12011#issuecomment-1336478368
 2022-12-10 11:38:42 -05:00
Hypolite Petovan b1860d4121 Check for last-activity value before feeding it to strtotime in Module\NoScrape 
- Address https://github.com/friendica/friendica/issues/12011#issuecomment-1340019523
 2022-12-10 11:38:41 -05:00
Hypolite Petovan c70d657885 Ward against invalid name from receiver in ActivityPub::storeReceivers 
- Address part of https://github.com/friendica/friendica/issues/12011#issuecomment-1338133783
 2022-12-10 11:38:41 -05:00
Hypolite Petovan f3dc69c226 Ensure strpos is provided a string in App::runFrontend 
- Address part of https://github.com/friendica/friendica/issues/12011#issuecomment-1338133783
 2022-12-10 11:38:41 -05:00
Hypolite Petovan fc246424a9 Provide default host value to hash() in Model\Item::guidFromUri 
- Address part of https://github.com/friendica/friendica/issues/12011#issuecomment-1338133783
 2022-12-10 11:38:37 -05:00
Hypolite Petovan 0af2be14ee Check for parts key existence before performing strpos in Network\Probe 
- Address part of https://github.com/friendica/friendica/issues/12011#issuecomment-1338133783
 2022-12-10 11:38:02 -05:00
Hypolite Petovan 1622ce0a99 Coalesce null activity name in ActivityPub\Processor 
- Address part of https://github.com/friendica/friendica/issues/12011#issuecomment-1338133783
 2022-12-10 11:38:02 -05:00
Hypolite Petovan e7574356d8 Replace parse_url with UriInterface instantiation in Model\APContact 
- Address part of https://github.com/friendica/friendica/issues/12011#issuecomment-1338133783
 2022-12-10 11:38:02 -05:00
Michael 2761972742 Simplify lastname/firstname 2022-12-10 16:02:38 +00:00
Michael ab1ff53b18 Diaspora added to localprobe 2022-12-10 15:59:11 +00:00
Hypolite Petovan 19d11c08d4 Change DiasporaContact->subscribe type to string 
- This avoids the expected "{uri}" placeholder to be URL-encoded in the string representation
 2022-12-10 09:23:29 -05:00
Michael c6ca844f33 "networks" has to contain all probing fields 2022-12-10 12:35:05 +00:00
Michael 6496ed4c19 Remove testcode, improve rearrange 2022-12-10 12:14:23 +00:00
Michael 019bb56668 Issue 12373: Fix communication to Diaspora 2022-12-10 12:08:55 +00:00
MarekBenjamin 75d857c595
Merge branch 'friendica:2022.12-rc' into new_image_presentation 2022-12-08 20:40:58 +01:00
Marek Bachmann d270a98e86 Image grid logic 2022-12-08 20:39:51 +01:00
Hypolite Petovan d9e69fc543 Fix OPTIONS responses 2022-12-08 10:10:40 -05:00
Hypolite Petovan 15eba181a0 Initialize parameter with $server for all Router cases including Maintenance mode 
- Address https://github.com/friendica/friendica/issues/11992#issuecomment-1339614287
- Address https://github.com/friendica/friendica/issues/11992#issuecomment-1339909728
 2022-12-08 10:10:23 -05:00
Michael 741469a5c5 Add images in a loop (preparation for a galery) 2022-12-08 07:16:25 +00:00
Michael 7d51fa47d5 Issue 12345: No link preview on DFRN posts 2022-12-08 05:49:25 +00:00
MarekBenjamin 74ff7bae59
Merge branch 'friendica:2022.12-rc' into new_image_presentation 2022-12-07 18:52:20 +01:00
Marek Bachmann d590df9a72 set character encoding to utf-8 for parsing rendered-html 2022-12-07 18:50:16 +01:00
Marek Bachmann 99e20d1b00 Temporary hack to remove images after last text line by DOM inspection 2022-12-07 13:22:28 +01:00
Michael 498a957009 The appearanxe of the link preview is now configurable 2022-12-07 07:02:04 +00:00
Hypolite Petovan 8d1bc02f8f
Merge pull request #12349 from annando/hidewall 
Fix "Missing hidewall key" message
 2022-12-06 23:57:09 -05:00
Michael e5ff71f839 Fix "Missing hidewall key" 2022-12-06 22:23:43 +00:00
Michael 6965614f00 API: Only search for direct hit without offset 2022-12-06 18:47:43 +00:00
Tobias Diekershoff 215c332a94
Merge pull request #12347 from annando/add-parents 
Fix post completion
 2022-12-06 19:21:22 +01:00
Michael 5e40b47a17 Fix post completion 2022-12-06 17:45:18 +00:00
Tobias Diekershoff 59088161e8 bump version to 2022.12-rc 2022-12-06 14:34:03 +01:00
Marek Bachmann 9778b60e64 cleaned up my git mess :-/ anyways, should work now 2022-12-06 01:14:15 +01:00
Marek Bachmann 2205ef0574 Merge remote-tracking branch 'origin/new_image_presentation' into new_image_presentation 
# Conflicts:
#	src/Model/Item.php
 2022-12-06 01:02:04 +01:00
Marek Bachmann 458f22d303 Support more than 2 images 2022-12-06 00:59:48 +01:00
Marek Bachmann 7fb0f018df First draft for using a image grid to display attached images. 2022-12-06 00:59:47 +01:00
Marek Bachmann 8145454707 Revert "Merge branch 'develop' into new_image_presentation" 
This reverts commit 76f4ba7685, reversing
changes made to 733543505b.
 2022-12-06 00:48:28 +01:00
Michael a260e97b6f The BlurHash function must not change the original image 2022-12-05 20:38:21 +00:00
Marek Bachmann 733543505b Merge branch 'develop' into new_image_presentation 2022-12-05 16:54:12 +01:00
Michael e62be24e6b Swap conditions 2022-12-05 12:53:21 +00:00
Michael b93f100c97 Merge remote-tracking branch 'upstream/develop' into imagick-blurhash 2022-12-05 07:34:16 +00:00
Michael 6deb93256a Support blurhash for Imagick 2022-12-05 06:53:19 +00:00
Hypolite Petovan 818cdf83ca [Database version 1500] Remove obsolete table fcontact 2022-12-05 00:00:50 -05:00
Hypolite Petovan ce69026964 [Database version 1499] Create new paradigm classes for Diaspora Contact 
- Switch table fcontact for dcontact in views
 2022-12-05 00:00:50 -05:00
Michael ace80ca1b4 Use "author_handle" for the author handle extracted from Diaspora XML messages 
- We have structured data under the variable name "author"
- Remove unused $uid parameter from Diaspora::storeByGuid
- Convert $person parameter to just its URL in Diaspora::authorContactByUrl
- Flip parameters in getUriFromGuid to get rid of $onlyfound
 2022-12-05 00:00:49 -05:00
Hypolite Petovan 32a9f39768
Merge pull request #12333 from annando/issue-12327 
Issue 12327: Convert avatars to static
 2022-12-04 23:30:58 -05:00
Michael 2be0ad7697 Remove test code 2022-12-05 03:59:47 +00:00
Michael 08d64f3c57 Fix the function description 2022-12-05 03:46:40 +00:00
Michael Vogel 28c7fda6e9
Update src/Factory/Api/Mastodon/Status.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-12-05 04:37:04 +01:00
Marek Bachmann fbd4b54656 Support more than 2 images 2022-12-05 04:23:34 +01:00
Marek Bachmann 6753eeab8b First draft for using a image grid to display attached images. 2022-12-05 03:27:51 +01:00
Michael 5bff6f38d7 Issue 12327: Convert avatars to static 2022-12-04 23:31:23 +00:00
Michael 4f98d2c74a Issue 11915: Show reshared posts for contacts 2022-12-04 21:57:58 +00:00
Michael 5c74113bf6 Issue 12275: Banner upload via avatar does work now 2022-12-04 16:33:29 +00:00
Hypolite Petovan 552a30e1f3
Merge pull request #12329 from annando/blurhash 
Use the blurhash when the remote picture doesn't load
 2022-12-04 10:34:30 -05:00
Michael 1c8690a872 Fix calls for pictures without blurhash 2022-12-04 15:14:43 +00:00
Michael cfe5101b9b Use the blurhash when the remote picture doesn't load 2022-12-04 14:58:53 +00:00
Philipp b3ca1e2bfb
Merge pull request #12325 from annando/blurhash 
API: Support Blurhash
 2022-12-04 15:25:33 +01:00
Michael a5be5b27e3 Support Blurhash 2022-12-04 13:29:21 +00:00
Hypolite Petovan a0752b1161 Escape HTML in event mapping callback 
- This prevents arbitrary Javascript from being executed from the calendar view
 2022-12-04 06:37:37 -05:00
Hypolite Petovan 2f42606c43 Add information about BBCode availability in event fields 2022-12-04 06:37:37 -05:00
Hypolite Petovan 349436a77a Fix event start time not being properly converted to UTC 
- This was triggering unexpected time comparison errors
 2022-12-04 06:37:36 -05:00
Hypolite Petovan 1b71b963d7 Fix description not being populated in event form when there's a validation error 2022-12-04 06:37:36 -05:00
Michael e5a531d3b5 Simplify "last-activity" handling 2022-12-04 07:17:26 +00:00
Michael 1d8c9276f3 Issue 10518: "last-activity" instead of "login_date" 2022-12-04 07:03:11 +00:00
Hypolite Petovan 22e2578b23
Merge pull request #12322 from annando/api-rules 
API: Central way to fetch the system rules
 2022-12-03 17:24:52 -05:00
Michael 16b76919c0 Rules added 2022-12-03 21:15:08 +00:00
Michael b6f7d31036 API: Central way to fetch the system rules 2022-12-03 20:18:19 +00:00
Michael fa80c69d94 Only fetch the processes if needed 2022-12-03 19:44:50 +00:00
Hypolite Petovan 8cb7d4a9bd
Merge pull request #12320 from annando/issue-11553a 
Issue 11553: Reliably return the user's contacts
 2022-12-03 12:20:34 -05:00
Michael 36c7aea214 Debug code removed 2022-12-03 15:37:40 +00:00
Hypolite Petovan 303d556ab0 Fix last reference of replaced variable $owner_nick in Protocol\Feed::atom() 
- Address https://github.com/friendica/friendica/issues/11994#issuecomment-1336146405
 2022-12-03 10:19:04 -05:00
Michael e4dda7d2ca Issue 11553: Reliably return the user's contacts 2022-12-03 14:19:48 +00:00
Hypolite Petovan 82972744a9
Merge pull request #12316 from VVelox/load_fix 
get the load average in a portable manner
 2022-12-03 05:38:55 -05:00
Zane C. Bowers-Hadley 8f82fb9a22 now with g 2022-12-03 04:34:17 -06:00
Zane C. Bowers-Hadley edaff99307 derp, minor fix 2022-12-03 04:31:04 -06:00
Zane C. Bowers-Hadley f664208157 get the load average in a portable manner 2022-12-03 04:24:49 -06:00
Hypolite Petovan e6f8b8c6e0 Ward against preg_replace_callback null return value in Strings::performWithEscapedBlocks 
- Add logging to troubleshoot potential issue with regex
- Address part of https://github.com/friendica/friendica/issues/12011#issuecomment-1335124938
 2022-12-03 04:20:27 -05:00
Hypolite Petovan 3b3192933d Ensure null values aren't processed in Content\Text\Markdown::toBBCode 
- Address part of https://github.com/friendica/friendica/issues/12011#issuecomment-1335124938
 2022-12-03 04:20:27 -05:00
Michael edc6851f0e Issue 12302: Remote self is working again 2022-12-03 07:15:29 +00:00
Matthias Moritz 7a39dfe23b Merge branch 'event-details-do-not-render-correctly-#12308' of https://github.com/matthiasmoritz/friendica into event-details-do-not-render-correctly-#12308 2022-12-02 21:01:20 +01:00
Matthias Moritz f27d9cb73e Update Event.php 2022-12-02 20:59:24 +01:00
Matthias Moritz 942d1e15f6
Merge branch 'friendica:develop' into event-details-do-not-render-correctly-#12308 2022-12-02 20:42:58 +01:00
Matthias Moritz 8b2a3805b6 Update Event.php 
fixing double encoding issue in event view.

fixes #12308
 2022-12-02 20:42:16 +01:00
Hypolite Petovan 98f4a68890 Ward against missing hidewall key in profile array in Model\Profile::getVCardHTML 
- Address part of https://github.com/friendica/friendica/issues/12011#issuecomment-1335124938
- Add logging to troubleshoot unexpected case
 2022-12-02 08:17:06 -05:00
Hypolite Petovan 34f21b40f4 Move missing POST part of Profile\Photos from mod/photos 2022-12-01 17:57:29 -05:00
Hypolite Petovan 84b2a35e05 Add new public_calendar additional feature 
- This gives anonymous access to public events
 2022-12-01 08:06:07 -05:00
Hypolite Petovan ae76fa1174 Remove unused first parameter from BaseProfile::getTabsHTML 
- Add expected Profile::load call to Profile\Photos module
 2022-12-01 08:03:35 -05:00
Hypolite Petovan b83526ad0b Tighten profile restriction feature 
- Prevent feed access to restricted profiles
- Rework display of restricted profiles with a redirect to the profile/restricted route
- Normalize permission checking with IHandleUserSession->isAuthenticated
- Remove unusable "nocache" parameter in feed module because session isn't initialized
- Reword setting name and description
 2022-12-01 08:03:35 -05:00
Hypolite Petovan 0d53c69610 Remove unused theme info value "events_in_profile" 
All public events (event if they are ownded by other users) are visible
 2022-12-01 08:03:34 -05:00
Hypolite Petovan 2baa56d478
Merge pull request #12298 from annando/api-suggestions 
Contact suggestions are now cached
 2022-12-01 05:25:44 -05:00
Michael 1d00947bcd Don't fetch sugestions for the system user / catch error on contact timeline 2022-12-01 07:07:59 +00:00
Michael 146f874c2e Avoid 'Undefined array key "last-activity"' 2022-12-01 06:12:13 +00:00
Michael 8e0196fec3 Update the last activity in OAuth 2022-12-01 06:02:51 +00:00
Michael 431eb34a1c Deactivate setting last activity 2022-12-01 05:57:29 +00:00
Michael 5201d87b3f Reenable last acttivity update 2022-12-01 05:54:42 +00:00
Michael 910a76812a Reenable worker call 2022-12-01 05:53:18 +00:00
Michael c56e4222dc Debug the failing test 2022-12-01 05:50:34 +00:00
Hypolite Petovan 8012968506 Check post existence before accessing its properties in Model\Post\UserNotification 2022-11-30 19:30:36 -05:00
Michael ed1a879b7b Use "utcNow" 2022-11-30 22:36:58 +00:00
Michael f905220923 New field to show the day of the last activity 2022-11-30 22:34:50 +00:00
Hypolite Petovan 1b0f7e5add
Merge pull request #12304 from HankG/add-dismissed-field-to-mastodon-notifications 
Add dismissed field to mastodon notifications
 2022-11-30 14:55:09 -05:00
Hank G f61dbf76a7
Update src/Module/Api/Mastodon/Notifications.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-11-30 14:39:00 -05:00
Hank G b51b537711
Update src/Factory/Api/Mastodon/Notification.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-11-30 14:38:53 -05:00
Hank Grabowski a2559d6241 Add 'include_all' parameter on Mastodon API endpoint 
Maintains old functionality of only returning non-dismissed notifications while adding ability to get list of dismissed and non-dismissed notifications
 2022-11-30 14:24:46 -05:00
Hank Grabowski a27ffda59f Add dismissed field to Mastodon API Notification types 2022-11-30 14:23:20 -05:00
Hank Grabowski 5b5c38f9ab Fix broken dismiss endpoint on Mastodon notifications API 2022-11-30 14:11:39 -05:00
MarekBenjamin 8f5d6fdf72
Merge branch 'friendica:develop' into show_image_upload_limit 2022-11-30 18:19:18 +01:00
MarekBenjamin e4fd9d425f
Update src/Module/Media/Photo/Upload.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-11-30 18:16:55 +01:00
MarekBenjamin f9c0d5a14b
Update src/Module/Media/Photo/Upload.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-11-30 18:16:42 +01:00
Michael fbcc56d42d Changes after code review 2022-11-30 14:33:55 +00:00
Michael 1ced4673fe Indention 2022-11-30 13:35:57 +00:00
Hypolite Petovan 7402bc9f50
Merge pull request #12299 from annando/auto-reshare-fix 
Check that an auto reshare is only done on the expected contact
 2022-11-30 08:34:10 -05:00
Matthias Moritz 2035a7a178 Merge branch 'bug-noLocalPosts' of https://github.com/matthiasmoritz/friendica into bug-noLocalPosts 2022-11-30 13:20:50 +01:00
Matthias Moritz 71f4dd0d20 Update Status.php 
Instead of removing AP, added Protocol::DFRN to the list of networks.
 2022-11-30 13:19:31 +01:00
Matthias Moritz 7676aa7908
Merge branch 'friendica:develop' into bug-noLocalPosts 2022-11-30 12:18:48 +01:00
Matthias Moritz da93373e8d Fix #12262 - shared friendica posts are filtered on status page 
Native shares from the same Instance (or maybe all Friendica instances) were filtered out from the users home. With this commit they now appear on the users Profile/Status
 2022-11-30 12:15:58 +01:00
Michael a01cdccb05 Check that an auto reshare is only done on the expected contact 2022-11-30 09:28:27 +00:00
Michael f31e617f5d Contact suggestions are now cached 2022-11-30 05:59:27 +00:00
Marek Bachmann 79235b6db1 Removed redundant maximagesize = INF statements 2022-11-30 05:17:48 +01:00
Marek Bachmann a3d8a59b00 Correctly output binary prefix values since base 2 is used for conversion 2022-11-30 04:37:08 +01:00
Marek Bachmann 75b01f669a Check for inf values before try to converts bytes to binary prefix strings 2022-11-30 04:35:18 +01:00
Marek Bachmann bb9afc520b Added getBytesFromShorthand at the remaining places. 2022-11-30 04:13:10 +01:00
Hypolite Petovan 150c0e0750 Address some PHP 8.1 deprecation notices 
- Replace a strstr call by strpos in Model\APContact
- Simplify conditions in Protocol\DFRN
- Address part of https://github.com/friendica/friendica/issues/12011#issuecomment-1331012289
 2022-11-29 21:37:41 -05:00
Marek Bachmann 97a3587e58 Added handling as infinity if maxfilesize is set to 0 2022-11-30 02:44:48 +01:00
Marek Bachmann ca7af7a64b Merge branch 'develop' into show_image_upload_limit 2022-11-30 02:28:15 +01:00
Marek Bachmann bbd1c34292 Wrapped all occurrences of DI::config()->get('system', 'maximagesize') with Strings::getBytesFromShorthand() 2022-11-30 02:26:56 +01:00
Marek Bachmann 99e1c64b1a Added info that shorthands can be used for maxfilesize Admin Site 2022-11-30 02:16:48 +01:00
MarekBenjamin 72b3bbb23c
Update src/Module/Admin/Site.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-11-30 01:49:53 +01:00
Marek Bachmann 7d86cb1a1e Removed Trends.php which for what ever reason found its way in my branch under src/Module/Api/Mastodon but is not present in friendica:develop 2022-11-30 01:40:21 +01:00
Marek Bachmann c03784eaa9 wanted to use a constant for the shorthand regex to be used in the form input templates and to check maximagesize post value. But Input field seems to require the regex without enclosing "/.../", so remove const for now 2022-11-30 01:26:08 +01:00
Marek Bachmann d44968cd10 split-off! Trends.php allow shorthands in the system.maximagesize 2022-11-30 01:26:08 +01:00
Marek Bachmann 9c383e2004 allow shorthands in the system.maximagesize 2022-11-30 01:26:08 +01:00
Michael 8eda9dfe7c Fix warning 'Undefined array key "name"' 2022-11-29 23:21:27 +00:00
MarekBenjamin 3cf0b9b9fd
Merge branch 'friendica:develop' into show_image_upload_limit 2022-11-29 21:58:46 +01:00
Michael 8b41d62a88 API: Speed improvements 2022-11-29 18:45:30 +00:00
Marek Bachmann 77c68d10e8 Merge branch 'develop' into show_image_upload_limit 2022-11-29 00:28:05 +01:00
Michael 3288efb323 Fix fatal errors because of unknown function/variable names 2022-11-28 21:22:21 +00:00
Hypolite Petovan 0ba111d99c
Merge pull request #12288 from annando/api-tags 
API: Added trending links
 2022-11-28 16:13:37 -05:00
Michael Vogel 7898f9cccb
Update src/Module/Api/Mastodon/Trends/Links.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-11-28 21:42:34 +01:00
Michael de76e860ad API: Added trending links 2022-11-28 20:19:57 +00:00
Hypolite Petovan d6a7303991
Merge pull request #12283 from annando/api-tags 
Issue 12191: API tag handling
 2022-11-28 14:52:29 -05:00
Philipp Holzer de25d3a7ee
Fix Legacy Router class routing 2022-11-28 20:14:37 +01:00
Michael bded1c3989 Only use items that had originally been posted in the last week 2022-11-28 14:51:37 +00:00
Michael 0e160040d4 Code standards 2022-11-28 10:54:26 +00:00
Michael c00004f6ea API: Tredning statuses added 2022-11-28 09:30:41 +00:00
Michael 73ba7d8005 Coding styles 2022-11-28 06:52:55 +00:00
Michael f7167acc74 Standards 2022-11-28 04:07:25 +00:00
Michael 56c4727fe1 Merge branch 'api-tags' of github.com:annando/friendica into api-tags 2022-11-28 04:04:35 +00:00
Michael 934766c364 Trim the tag 2022-11-28 04:04:27 +00:00
Michael Vogel 4e6b6fd76b
Update src/Module/Api/Mastodon/FollowedTags.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-11-28 05:00:08 +01:00
Michael 85f57e69fa Issue 12191: We can now follow and unfollow tags via API 2022-11-28 03:29:43 +00:00
Michael a6d060b0e4 Merge remote-tracking branch 'upstream/develop' into api-tags 2022-11-28 02:13:20 +00:00
Marek Bachmann d43e393921 and now the missing ')' at the correct position 2022-11-28 01:16:54 +01:00
Marek Bachmann 5b2ac7b944 Added missing ')' 2022-11-28 01:11:02 +01:00
MarekBenjamin 6877f8a473
Update src/Module/Admin/Site.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-11-28 01:06:40 +01:00
Marek Bachmann a01872a117 Merge branch 'develop' into show_image_upload_limit 
# Conflicts:
#	src/Util/Strings.php
#	view/lang/C/messages.po
 2022-11-27 23:52:58 +01:00
Michael 6d74d74a26 Issue 12149: Show that a post was reshared 2022-11-27 20:47:08 +00:00
Michael 0e2c2cd0e0 API: Support new tag endpoints 2022-11-27 19:22:41 +00:00
Hypolite Petovan db987999b5 Return only one result in case of exact match in Api\Mastodon\Search 2022-11-27 08:28:52 -05:00
Hypolite Petovan 9fbdcb5459
Merge pull request #12277 from nupplaphil/mod/fbrowser 
Move mod/fbrowser to src\Modules\Attachment|Photos\Browser
 2022-11-27 07:55:55 -05:00
Philipp b56e6f4b5b
Merge pull request #12280 from MrPetovan/bug/11804-delete-notifications-item 
Remove related notifications when marking an item for deletion
 2022-11-27 09:01:28 +01:00
Hypolite Petovan 25e1412174 Remove related notifications when marking an item for deletion 2022-11-26 21:48:26 -05:00
Philipp Holzer 3ac3b3d2af
Perfection! 2022-11-27 01:52:49 +01:00
Philipp 272911527c
Apply suggestions from code review 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-11-27 01:52:14 +01:00
Philipp Holzer 4e53ba0c20
Cache the Module class 2022-11-27 01:48:52 +01:00
Philipp Holzer 29190fae73
Update messages.po 2022-11-27 01:36:31 +01:00
Philipp Holzer 012f486eb6
Adhere feedback 2022-11-27 01:34:59 +01:00
Philipp Holzer e6933a28da
Be more kindly :-) 2022-11-27 01:34:59 +01:00
Philipp Holzer 50316bbb80
Move Browser & Upload to own namespace 2022-11-27 01:34:59 +01:00
Philipp Holzer 051253a745
Move FileBrowser to own namespace & Bugfix album usage 2022-11-27 01:34:58 +01:00
Philipp 3607aa32ca
Apply suggestions from code review 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-11-27 01:34:58 +01:00
Philipp e60dfef0d0
Update src/App/Arguments.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-11-27 01:34:58 +01:00
Philipp Holzer 7c058153b5
Make PHP-CS happy 2022-11-27 01:34:58 +01:00
Philipp 801ee5c17f
Merge pull request #12276 from MrPetovan/bug/fatal-errors 
Address a couple of fatal errors
 2022-11-27 00:31:14 +01:00
Marek Bachmann 719c294fb5 Added info about upload_max_filesize to admin page 2022-11-26 23:45:58 +01:00
Hypolite Petovan a5f601718f Add a default value for $data['version'] in Model\GServer 
- Address https://github.com/friendica/friendica/issues/11993#issuecomment-1327320541
 2022-11-26 17:28:55 -05:00
Hypolite Petovan b6d62003a6 Have a default value for $item['contact-id'] in Model\Post\Delayed 
- Address https://github.com/friendica/friendica/issues/11993#issuecomment-1327030873
 2022-11-26 17:27:36 -05:00
MarekBenjamin 765b50bde8
Update src/Util/Strings.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-11-26 23:14:21 +01:00
MarekBenjamin ce56cabd9f
Update src/Util/Strings.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-11-26 23:12:46 +01:00
Philipp Holzer 3ef7ae2f74
License :) 2022-11-26 22:33:45 +01:00
Philipp Holzer d0b16b2fc1
Move mod/fbrowser to src\Modules\Attachment|Photos\Browser 2022-11-26 22:26:30 +01:00
Marek Bachmann 6c73077bbc whitespaces 2022-11-26 21:53:12 +01:00
Marek Bachmann 907deed523 introduced getBytesFromShorthand function to covert from shorthand notation to int 2022-11-26 21:43:31 +01:00
Hypolite Petovan ed7b175491 Catch worker argument type errors 
- This marks the invalid worker queue item as completed instead of endlessly retrying it
- Address https://github.com/friendica/friendica/issues/11992#issuecomment-1327029331
 2022-11-26 15:21:46 -05:00
Michael acfc11c436 Issue 12133: Account data can now be updated via API 2022-11-26 08:56:24 +00:00
Michael 8879d93aad Issue 12266: APISuggestions should now work 2022-11-26 02:08:34 +00:00
Hypolite Petovan 29ee2473d7
Merge pull request #12269 from annando/api-edit 
Issue 12192: API: Enable edit
 2022-11-25 19:22:27 -05:00
Philipp c2c563be26
Merge pull request #12249 from MrPetovan/bug/deprecated 
Address several PHP 8.1 deprecation notices
 2022-11-25 23:32:32 +01:00
Philipp 4291e0def5
Merge pull request #12246 from MrPetovan/bug/notices 
Ensure the existence of various keys in decoded data in Diaspora::decodeRaw
 2022-11-25 23:30:56 +01:00
Michael 92807d86a3 API: Enable edit 2022-11-25 19:35:40 +00:00
Hypolite Petovan 55640eec87 [Composer] Upgrade to phpseclib version 3 
- Create custom Key file format for Salmon Magic key
- Remove obsolete pemToME and MEtoPem Crypto methods
- Remove unused newECKeypair Crypto method
- Switch to constant-time Base64 encode/decode in Base64Url Strings methods
 2022-11-25 08:13:05 -05:00
Hypolite Petovan a3fb499735 Replace call to parse_url() with Uri instanciation in Util\Proxy 
- Address part of https://github.com/friendica/friendica/issues/12011#issuecomment-1321796513
 2022-11-25 08:13:05 -05:00
Hypolite Petovan 0ec7238da4 Fix null value passed to string functions deprecation notices 
- Address part of https://github.com/friendica/friendica/issues/12011#issuecomment-1321796513
 2022-11-25 08:13:05 -05:00
Hypolite Petovan 6b555f64da Add \ReturnTypeWillChange attribute to methods inherited from native interfaces 
- Part of https://github.com/friendica/friendica/issues/12011#issuecomment-1321796513
 2022-11-25 08:13:05 -05:00
Hypolite Petovan 01558d6dda
Merge pull request #12264 from annando/error 
Fix "Argument #1 ($parts) must be of type array, bool given"
 2022-11-25 08:05:10 -05:00
Michael fa5e7585a3 Fix "Argument #1 ($parts) must be of type array, bool given" 2022-11-25 06:08:56 +00:00
Hypolite Petovan 9de6350154 Reorder search to try redirecting to post first 
- Pleroma's post page includes the author's feed which wrongly gets picked up as a contact
- Address https://libranet.de/display/0b6b25a8-1563-7ec0-7408-70b986546395
 2022-11-24 22:21:51 -05:00
Marek Bachmann 18f0d3d31e removed double blank 2022-11-25 01:03:34 +01:00
Marek Bachmann f4e2c7a11d corrected typos in DocBlocks 2022-11-25 00:59:24 +01:00
Hypolite Petovan 313f3d8515
Merge pull request #12255 from annando/invalid-unfollow 
Silently quit on unfollow of invalid contacts
 2022-11-24 14:46:59 -05:00