keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
36996 commits 4 branches 0 tags 179 MiB
Commit graph

11114 commits

Author SHA1 Message Date
Hypolite Petovan
0b1f67f5b3
Merge pull request #12917 from annando/remove-tab 
Remove tabs if followed by new lines (or vice versa)
 2023-03-20 07:09:51 -04:00
Michael Vogel
d3e085bd5a
Merge pull request #12916 from nupplaphil/feat/reduce_logging_noise 
Adapt loglevels to reduce log-noise
 2023-03-20 08:52:16 +01:00
Philipp
d8792c9c11
Update src/Model/Item.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2023-03-20 07:04:59 +01:00
Michael
b7288b2bfd Merge remote-tracking branch 'upstream/2023.03-rc' into remove-tab 2023-03-20 04:16:52 +00:00
Michael
f65c71a25b Restructured replacements 2023-03-20 04:10:35 +00:00
Michael
12d2de2c93 Remove tabs if followed by new lines (or vice versa) 2023-03-19 20:16:41 +00:00
Philipp
88e339a43d
Adapt loglevels to reduce log-noise 2023-03-19 19:33:03 +01:00
Jakobus Schürz
faa524faec revert changes, remove line (from code-review) 2023-03-19 18:52:46 +01:00
Jakobus Schürz
399ee74e05 revert to original (no changes needed anymore) 2023-03-19 18:52:46 +01:00
Jakobus Schürz
6436d2cd8a changes in case of code-review 2023-03-19 18:52:46 +01:00
Jakobus Schürz
920dcca263 render max_imagesize in header.tpl 
so it is reachable general from the whole website, and the dropzone-factory can use
it also to create dropzones from modal.js
 2023-03-19 18:52:46 +01:00
Jakobus Schürz
0cc2e1c22a apply changes from review 2023-03-19 18:52:45 +01:00
Jakobus Schürz
512e5900e6 use round instead of floor to make imagesize <1M possible 2023-03-19 18:52:45 +01:00
Jakobus Schürz
ada11a2c67 create factory for dropzones 2023-03-19 18:52:45 +01:00
Jakobus Schürz
39f7660a1d fix getting bytes from shorthand in php 2023-03-19 18:52:45 +01:00
Jakobus Schürz
3688196859 create workaround for not working php 
Strings:getBytesFromShorthand

i created a js-function which converts integer, k, m and g to MB
Just remove this code, when we found out, why Strings is in some files
not working.
 2023-03-19 18:52:45 +01:00
Jakobus Schürz
00ae7d0f59 make dropzone work on editing postings/Comments 2023-03-19 18:52:45 +01:00
Jakob Schürz
177bf9b67b fix missing DI 2023-03-19 18:52:45 +01:00
Jakobus Schürz
be2afac60d take maxFilesize from systemsettings 
* does not work everywhere...
 2023-03-19 18:52:45 +01:00
Jakobus Schürz
359ad6ff5a fix a warning and suggestions for pullrequest 
* fix indentation to tabs
* remove unneeded calls for dropzone.min.js and dropzone.min.css
* removed debug output
 2023-03-19 18:52:45 +01:00
Jakobus Schürz
29d7b4ef24 fix path for js and css loading 2023-03-19 18:52:45 +01:00
Philipp
29e4f0ea9a
Force correct string casting for BaseUrl 2023-03-19 11:21:17 +01:00
Philipp
c95e961683
Merge pull request #12892 from MrPetovan/bug/12888-media-upload-return 
Prevent template generation in media/[photo|attachment]/upload output
 2023-03-19 08:28:59 +01:00
Philipp
5062e174b7
Merge pull request #12914 from MrPetovan/bug/12842-bbcode-html-list 
Rework new lines around list BBCode
 2023-03-19 08:27:31 +01:00
Hypolite Petovan
241a512589 Ensure FactorySession->create returns an object no matter what 
- Rename redundant method name createSession
- Add exception logging
 2023-03-18 23:36:07 -04:00
Hypolite Petovan
1ce438e964 Rework new lines around list BBCode 
- Remove blanket new lines remover in HTML::toBBCode
- Add test to ensure the commutativity of the markups
 2023-03-18 23:35:51 -04:00
Hypolite Petovan
200bdb55ba Normalize [ul] and [ol] BBCode output to <ul> and <ol> HTML tags 2023-03-18 23:35:51 -04:00
Hank Grabowski
4366737eb8 Fix posting/editing empty text image posts through Mastodon API 2023-03-18 23:06:13 -04:00
Hypolite Petovan
d886a53af0
Merge pull request #12912 from HankG/fix-cant-remove-attachment 
Fix cant remove attachment
 2023-03-18 22:17:14 -04:00
Hank Grabowski
261975afe9 Delete previous post version's link attachments before posting the one from the current update. 2023-03-18 21:35:38 -04:00
Michael
04b2d2339e Improved config description / use the delete command 2023-03-18 21:34:15 +00:00
Michael
a151cf450a Blocked servers can now be deleted 2023-03-18 19:41:41 +00:00
Michael
eab4d6cbb4 Simplified Nomad detection 2023-03-18 12:27:49 +00:00
Michael
9c1516feb2 Takahē and Wildebeest added, Nomad detection improved 2023-03-18 11:43:29 +00:00
Hypolite Petovan
759e76cae6
Merge pull request #12907 from annando/issue-12863 
Issue 12863: Convert Hubzilla mentions to Friendica mentions
 2023-03-18 07:24:12 -04:00
Hypolite Petovan
cd8b2fe24e
Merge pull request #12906 from annando/issue-12870 
Issue 12870: Support for zmg elements from Hubzilla
 2023-03-18 07:22:28 -04:00
Michael
efb2b47dc9 Issue 12863: Convert Hubzilla mentions to Friendica mentions 2023-03-18 07:59:47 +00:00
Michael
e73d1e13c2 Issue 12870: Support for zmg elements from Hubzilla 2023-03-18 07:05:38 +00:00
Tobias Diekershoff
7eed9e1818
Merge pull request #12905 from annando/issue-12858 
Issue 12858: Peertube avatars can now be fetched
 2023-03-18 07:55:19 +01:00
Michael
1a98961c3c Issue 12858: Peertube avatars can now be fetched 2023-03-18 06:41:35 +00:00
Hank Grabowski
7f4f44a3a8 Fix paging on List and Public timelines honoring order type 2023-03-17 22:13:43 -04:00
Hank Grabowski
e969ecd351 Add paging to Account/Statuses Mastodon endpoint 2023-03-17 22:13:17 -04:00
Hank Grabowski
c609affeca Fix Mastodon InstanceV2 structure needs image max size under mediaAttachment 2023-03-17 15:56:42 -04:00
Michael
e55f38cc98 Fix test 2023-03-17 18:01:51 +00:00
Michael
d058275723 Some tests added / ensure to have paragraphs 2023-03-17 17:40:22 +00:00
Michael
dfaf3eee6b Only add paragraphs if needed 2023-03-17 12:33:13 +00:00
Michael
1146fca2cd HTML: Use paragraphs instead of double line breaks 2023-03-17 06:10:56 +00:00
Hypolite Petovan
54afccc852 Prevent template generation in media/attachment/upload output 2023-03-16 21:14:07 -04:00
Hypolite Petovan
c62762297c Prevent template generation in media/photo/upload output 2023-03-16 21:14:07 -04:00
Hypolite Petovan
a0f3a49238
Merge pull request #12895 from HankG/mastodon-status-edit-fix-deleting-all-images 
Fix being able to remove all images from post through Mastodon editing
 2023-03-16 16:41:09 -04:00
Hank Grabowski
02a87d9f33 Fix being able to change/remove attached links. 2023-03-16 14:34:39 -04:00
Hank Grabowski
e7058ffe8c Fix being able to remove all images from post through Mastodon edit endpoint 2023-03-16 14:01:36 -04:00
Hypolite Petovan
b3d779ef7b
Merge pull request #12894 from HankG/mastodon-status-edit-fix-tag-and-mentions 
Fix tag and mention updates in Mastodon status edit endpoint
 2023-03-16 11:55:05 -04:00
Hank Grabowski
bb2f678d6b Fix tag and mention updates in Mastodon status edit endpoint 2023-03-16 10:53:13 -04:00
Michael
453011baa7 Merge remote-tracking branch 'upstream/2023.03-rc' into remove-media 2023-03-16 05:01:50 +00:00
Michael
31693c2d1f Separation between picture links 2023-03-16 05:01:05 +00:00
Hypolite Petovan
bcec7306a5
Merge pull request #12891 from annando/system-variables 
More reliable system variables
 2023-03-15 18:37:38 -04:00
Michael
54d5f2df43 More reliable system variables 2023-03-15 21:16:21 +00:00
Michael
eefebaff49 Improved handling of images with links 2023-03-15 21:15:10 +00:00
Hypolite Petovan
705e86f8c3
Merge pull request #12877 from xundeenergie/like-buttons-improvement 
[frio] Like buttons improvement
 2023-03-15 10:22:23 -04:00
Michael
7dd9972b85 Changes because of code review 2023-03-15 03:55:39 +00:00
Michael
e3047794f9 Merge remote-tracking branch 'upstream/2023.03-rc' into api-edit 2023-03-14 21:46:24 +00:00
Jakobus Schürz
f8018f8dfe make errormessages modular and better 2023-03-14 17:32:11 +01:00
Jakobus Schürz
9140914a24 make erromessages translateable 2023-03-14 17:32:11 +01:00
Michael
7382c3bd86 Set the field to "null" 2023-03-14 16:18:16 +00:00
Michael
6ffecd2b74 "edited_at" must only be displayed when the entry had been updated 2023-03-14 16:07:54 +00:00
Tobias Diekershoff
bb835848d4
Merge pull request #12886 from annando/auto-attach 
Option to automatically add links as attachment via API
 2023-03-14 08:18:21 +01:00
Michael
4e070f65c7 Option to automatically add links as attachment via API 2023-03-13 21:30:20 +00:00
Tobias Diekershoff
c389b48a9f bump version to 2023.03-rc 2023-03-13 21:22:33 +01:00
Hypolite Petovan
84dfda1ccd
Merge pull request #12884 from annando/no-attachData 
The function "getAttachedData" is replaced by a simplified functionality
 2023-03-13 08:29:07 -04:00
Michael
59c436b442 Merge remote-tracking branch 'upstream/develop' into api-edit 2023-03-13 05:33:32 +00:00
Michael
2a752b37b1 The function "getAttachedData" is replaced by a simplified functionality 2023-03-13 05:04:55 +00:00
Hypolite Petovan
30e1851747 Cast the base URL as string in /friendica/json 
- This was causing the data.url key to have no value, which broke the directory integration
 2023-03-12 17:55:57 -04:00
Hank G
a6e9f9c89e
Apply suggestions from code review 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2023-03-12 11:43:59 -04:00
Hank G
4fe278be7d
Merge branch 'friendica:develop' into mastodon-edit-title-spoiler-update 2023-03-11 08:28:51 -06:00
Michael
a4503601e5 Comment readded 2023-03-09 07:05:45 +00:00
Michael
0c8923aabd Use the built in function to create a query string 2023-03-09 06:46:14 +00:00
Michael
e0fe3bf77d Fix plaintext function by partly reverting function removal 2023-03-06 18:00:58 +00:00
Michael
c1686c486c Fix warning 2023-03-06 06:43:04 +00:00
Michael
699be97ea1 Reformatted code 2023-03-06 06:15:30 +00:00
Michael
aea3ed4548 Code is reformatted 2023-03-05 21:46:45 +00:00
Michael
eafe54f2dd The function "getAttachedData" has been removed 2023-03-05 21:22:22 +00:00
Michael
d41ec728e4 We only need a link here 2023-03-04 21:36:19 +00:00
Michael
60ddef1720 Unneeded field removed 2023-03-04 19:28:31 +00:00
Michael
b761760d65 Fix missing attached links in posts 2023-03-04 19:04:37 +00:00
Michael
9e4753f440 Merge remote-tracking branch 'upstream/develop' into api-edit 2023-03-03 03:56:19 +00:00
Michael
ea3a56ccfa API: Fix dateformat on status 2023-03-02 21:07:33 +00:00
Michael
fc8421b57b Merge remote-tracking branch 'upstream/develop' into api-edit 2023-03-01 05:17:13 +00:00
Hank Grabowski
63a65b6d02 Fix passing in correct change fields to Mastodon Status FriendicaExtension 2023-02-28 16:10:13 -05:00
Hank Grabowski
7ccc978bc5 Add title/spoiler text handling and capturing invalid update to Mastodon edit 2023-02-28 15:35:37 -05:00
Hank Grabowski
1e48978664 Use Mastodon standard edited_at field for tracking edit time 2023-02-28 15:02:02 -05:00
Hank G
c7457c7a72
Update src/Module/BaseApi.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2023-02-28 13:49:23 -05:00
Hank Grabowski
80896936b2 Remove extra lines from TimelineOrderByTypes.php to get rid of server side only formatting error 2023-02-28 13:12:11 -05:00
Hank Grabowski
13672bccf4 Only allow explicitly known order types through 2023-02-28 13:10:45 -05:00
Hank Grabowski
f0b3864c7a Add default getLinkHeader asDate to be false (the previous ID-only way) 2023-02-28 12:48:25 -05:00
Hank Grabowski
fae67b6d88 Remove extra line between copyright and namespace 2023-02-28 11:44:49 -05:00
Hank Grabowski
260f4e46ab Correct format/style errors 2023-02-28 11:43:12 -05:00
Hank Grabowski
32bb097604 Correct format/style errors 2023-02-28 11:41:53 -05:00
Hank Grabowski
c33c624f83 Add new temporal paging to Mastodon Timeline Public and List endpoints 2023-02-28 11:36:24 -05:00
Hank Grabowski
4f86cd0923 Add comment to friendica_order query parameter in Mastodon Timeline Home 2023-02-28 11:35:54 -05:00
Hank Grabowski
099ef11183 Fix tag filtering on block/mute list 2023-02-28 11:35:21 -05:00
Hank Grabowski
1f6578229e Add additional Mastodon timeline sorting date types and data to output 2023-02-28 10:36:11 -05:00
Hank Grabowski
1adb23d8fd Change timestamp to be DateTime object not integers in Mastodon Timeline API 2023-02-28 08:20:08 -05:00
Michael
3a0b0ffce5 Editing of media descriptions is now possible as well 2023-02-28 08:06:49 +00:00
Michael
98aed4dde3 Adding and removing of pictures via API is now possible 2023-02-28 06:19:19 +00:00
Hank Grabowski
6ffd3a3f8c Merge branch 'develop' into mastodon-timeline-temporal-paging 2023-02-27 20:20:40 -05:00
Michael
a5b774d2ef Without "->__toString()" 2023-02-27 21:15:11 +00:00
Michael
cbb9cb6c24 Fix v1 endpoint 2023-02-27 21:02:59 +00:00
Michael
2849a96628 Issue 12415: Handle attachment updates via AP 2023-02-27 20:02:05 +00:00
Philipp
61deaec4be
Merge pull request #12848 from HankG/fix-mastodon-v2-active-month-naming-error 
Fix mastodon v2 active month naming error
 2023-02-27 19:51:25 +01:00
Hank Grabowski
2f3a7c422f Fix whitespace issue 2023-02-27 13:47:02 -05:00
Hank Grabowski
b375f64e0e Add int hint to Mastodon V2 UserStats.php 2023-02-27 13:04:24 -05:00
Michael Vogel
0338d9fda8
Update src/Model/Post/Media.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2023-02-27 14:31:56 +01:00
Michael
5f6503a73f Editing/removing of attached pictures is now possible via web 2023-02-27 07:47:31 +00:00
Philipp
a40ecb3902
Merge pull request #12843 from annando/fetchraw-attachments 
Catch all errors thrown by "fetchRaw"
 2023-02-27 08:24:05 +01:00
Michael
bd3120d6cb Use non static logger call 2023-02-27 07:02:06 +00:00
Hank Grabowski
bb29a07efa Change Mastodon Instance V2 active_monthly field to correct active_month 2023-02-26 22:57:10 -05:00
Hank Grabowski
706a42ffd0 Change Mastodon Instance V2 active_monthly field to correct active_month 2023-02-26 22:56:56 -05:00
Michael
6e3602591d Use "Exception" 2023-02-26 22:43:45 +00:00
Philipp
de53109a49
Merge pull request #12844 from HankG/mastodon-status-add-delivery-data 
Add Delivery Information to Mastodon Status API Entity
 2023-02-26 23:03:30 +01:00
Hank Grabowski
9ab73c30ef Allow delivery stats to be null. 2023-02-26 11:27:01 -05:00
Hank Grabowski
ea782d97fc Make calls inline and return 0 if value is null 2023-02-26 10:26:15 -05:00
Hank Grabowski
0f811abc50 Add nullability to InstanceV2 Contact type for account parameter 2023-02-26 09:38:22 -05:00
Michael
2b513a48c7 Catch all errors thrown by "fetchRaw" 2023-02-26 14:08:33 +00:00
Hank Grabowski
751e335b4b Add delivery status data to Mastodon Status Friendica Extension 2023-02-25 14:23:59 -05:00
Hank Grabowski
9a6ebc94c4 Add support for since_id field into the timeline API 2023-02-23 07:04:12 -05:00
Hank Grabowski
cbf55241a3 Null out min/max/since ID fields by default in Mastodon Timeline API 2023-02-23 07:03:58 -05:00
Hypolite Petovan
1cff849a94
Merge pull request #12838 from HankG/blocks-status-fix 
Correctly reflect blocked status in Mastodon Relationship Object
 2023-02-22 16:49:55 -05:00
Hank Grabowski
614ad32f71 Merge branch 'develop' into mastodon-timeline-temporal-paging 2023-02-22 13:26:51 -05:00
Hank Grabowski
a301f8a82d Merge branch 'develop' into fix-blocks-ignores-in-full-context-status-request 2023-02-22 13:26:28 -05:00
Hank Grabowski
7224c0fc38 Merge branch 'develop' into blocks-status-fix 2023-02-22 12:08:06 -05:00
Hank Grabowski
4a00731aa4 Breakup public/user ID query results so can always query blocked status by CID 2023-02-22 12:07:57 -05:00
Hank Grabowski
b06a3e877e Add show_all option to Mastodon status context to show ignored and blocked statuses 2023-02-22 11:45:42 -05:00
Hank Grabowski
a67fe069e8 Add order/limit building func and fix reverse order requirement on min_id 2023-02-22 11:27:54 -05:00
Hank Grabowski
9c5f3ae58f Simply Timeline Home temporal endpoint to reuse min_id and max_id 2023-02-22 11:02:52 -05:00
Michael
08ba9e4183 Fix emoji activities 2023-02-21 21:07:41 +00:00
Hank Grabowski
818075d039 Implement time based paging for Mastodon Home Timeline Endpoint 2023-02-21 15:37:32 -05:00
Hank Grabowski
3958739d60 Add to Mastodon Status/Context filter for ignored and blocked user's comments 2023-02-21 13:53:16 -05:00
Hypolite Petovan
5acbcba5c2
Merge pull request #12829 from Quix0r/fixes/export-to-file-null 
Fixed: DomainPatternBlocklist::exportToFile() must be of the type string, null given
 2023-02-21 09:13:19 -05:00
Roland Häder
ed86e9ca96
Fixed: 
- added check for empty file name as the export doesn't work without one:
  `[Error] Argument 1 passed to Friendica\Moderation\DomainPatternBlocklist::exportToFile() must be of the type string, null given, called in /var/www/.../src/Console/ServerBlock.php on line 110`
 2023-02-21 12:58:50 +01:00
Hank Grabowski
9c9abd4400 Merge branch 'develop' into dislike-for-mastodon-endpoints 2023-02-20 15:52:09 -05:00
Hank Grabowski
155e3a701e Add DislikedBy Mastodon compatible endpoint in the Friendica API space 2023-02-20 15:51:17 -05:00
Hank Grabowski
c419aabee4 Add deleted check to FavouritedBy Mastodon endpoint 2023-02-20 15:50:21 -05:00
Hank Grabowski
c235bf299e Add Mastodon format compatible (un)dislike endpoint in Friendica API space 2023-02-20 15:33:36 -05:00
Hank Grabowski
dba74c7940 Fix phpcbf style errors in part of code I didn't change 2023-02-20 15:32:03 -05:00
Hank Grabowski
3a8929be1f Add dislike counts to Mastodon API Statuses in FriendicaExtension 2023-02-20 15:31:15 -05:00
Hypolite Petovan
dec5a40aac
Merge pull request #12818 from HankG/mastodon-instance-v2-implementation 
Mastodon instance v2 implementation
 2023-02-20 14:16:17 -05:00
Hank Grabowski
6cd271b10f Modify to use the new baseURL methods. 2023-02-20 13:33:13 -05:00
Hank Grabowski
06f53d2d1a Add missing spaces after colons for function parameters for style check reasons 2023-02-20 13:31:04 -05:00
Hank Grabowski
5c3bd4acd1 Merge branch 'develop' into mastodon-instance-v2-implementation 2023-02-20 13:25:59 -05:00