clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
23,961 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

831 Commits

Author SHA1 Message Date
Michael fd6c64f9c1 Warning and notice fixed 2018-12-29 09:53:31 +00:00
Michael Vogel 94eca77041
Merge pull request #6315 from MrPetovan/bug/6309-add-fulltext-index-profile 
Rework mod/match and mod/msearch
 2018-12-27 18:04:06 +01:00
Hypolite Petovan 56d612b2f0
Merge pull request #6323 from annando/issue-6316 
Issue 6316: Do not double encode / Avoid notice
 2018-12-25 11:26:54 -05:00
Michael ccb9be8f28 Issue 6316: Do not double encode / Avoid notice 2018-12-25 12:12:59 +00:00
Hypolite Petovan a8b0aa8c8d Normalize expected format for event fields summary, desc and location 
- Remove unnecessary HTML escaping on event submit
- Add HTML escaping on event display
- Add HTML to BBCode conversion for received ActivityPub events
 2018-12-24 23:00:35 -05:00
Hypolite Petovan acaee626f5 Remove include/ requires that are now done directly from Composer 2018-12-24 09:56:25 -05:00
Michael c43bd890a5 The "Follow" activity shouldn't be send to Diaspora 2018-12-24 14:50:21 +00:00
Jeroen De Meerleer 2d9f4b560f Too fast 2018-12-22 17:23:18 +01:00
Jeroen De Meerleer 27eddfee27 Fixed bug 
$curlResult is not an array
 2018-12-22 17:19:34 +01:00
Hypolite Petovan b6e1571b1e Fix various notices 2018-12-15 04:32:47 -05:00
Michael 6733b77b73 Make it simpler 2018-12-03 19:29:06 +00:00
Michael d76003797a Fix for notice 2018-12-03 16:32:03 +00:00
Michael 51bce11b69 Issue 5911: Fix for fetching the correct user 2018-12-03 06:16:25 +00:00
Hypolite Petovan 57695d48b4
Merge pull request #6223 from annando/ap-dba-error 
Fix for "Unknown column 'guid' in 'field list'"
 2018-12-02 19:18:36 -05:00
Michael 2fd65503da Avoid database error that the field "guid" is not present in the contact table 2018-12-02 15:01:08 +00:00
Hypolite Petovan 458981f75c Replace x() by isset(), !empty() or defaults() 
- Remove extraneous parentheses around empty() calls
- Remove duplicate calls to intval(), count() or strlen() after empty()
- Replace ternary operators outputting binary value with empty() return value
- Rewrite defaults() without x()
 2018-11-30 09:06:22 -05:00
Michael Vogel 3f4636d490
Merge pull request #6183 from MrPetovan/bug/6135-hide-follower-only-birthdays 
Hide follower-only birthday reminders
 2018-11-24 15:55:43 +01:00
Michael Vogel 42a3610a79
Merge pull request #6184 from MrPetovan/task/normalize-bbcode-hashtags 
Normalize BBCode hashtags links
 2018-11-24 13:14:50 +01:00
Michael ea5ba309dc Some more AP blocking 2018-11-22 22:31:48 +00:00
Michael 2f7b138b09 Block AP delivery 2018-11-22 22:23:31 +00:00
Hypolite Petovan 4874f7f8ab Remove useless rawurlencode calls for building hashtag bbcode 
- Fix some formatting
 2018-11-22 09:32:41 -05:00
Hypolite Petovan de5ee56d2f Move DFRN::birthdayEvent() to Event::createBirthday 2018-11-22 00:15:09 -05:00
Hypolite Petovan d71e856535 Replace remaining occurrences of "0001-01-01" with DBA::NULL_DATE 2018-11-21 23:53:45 -05:00
Michael 27d1da0468 One space too much 2018-11-20 20:49:06 +00:00
Michael 5c39779b45 AP: Security check against forged "create" activities 2018-11-20 20:40:47 +00:00
Michael Vogel 9dfc970bd6
Merge pull request #6144 from Alkarex/ATOM-self 
Correct self attribute in ATOM feeds
 2018-11-18 12:31:15 +01:00
Alexandre Alapetite bd19e93c09 Minor code relocation 
https://github.com/friendica/friendica/pull/6144/files#r234385033
 2018-11-17 01:36:54 +01:00
Alexandre Alapetite dd65c5d150 Apply correct title encoding to all cases 2018-11-17 01:30:53 +01:00
Alexandre Alapetite af38d22d38 Fix ATOM feed title encoding 
Was HTML-encoded instead of plain Unicode.
Fixed only for feed_mode. Probably wrong as well for non_feed mode (not
sure how to test)
 2018-11-16 23:52:36 +01:00
Alexandre Alapetite d85e26d314 Refactor header with feed_mode 
https://github.com/friendica/friendica/pull/6140#issuecomment-439475027
 2018-11-16 23:29:26 +01:00
Alexandre Alapetite 97d164f69e Correct self attribute in ATOM feeds 
Fix for
https://github.com/friendica/friendica/issues/6128#issuecomment-439016471
Special case for DFRN to reduce the risk of unintended side effects
 2018-11-16 18:54:06 +01:00
Michael c3b6727fad Some more feed simplification 2018-11-15 16:21:37 +00:00
Michael 5f258dac22 Make feeds look more like feeds 2018-11-15 13:21:58 +00:00
Michael 08433873f5 Issue 6128 again: We now use our regular feed that allows anonymous polling 2018-11-14 19:26:23 +00:00
Michael 7458d793ed Removing some notices again 2018-11-11 12:15:17 +00:00
Hypolite Petovan a6a3c268bb Use atom:author/atom:uri as profile-link in Feed::import 
- Use atom:author/atom:id as profile-id
 2018-11-10 08:24:10 -05:00
Adam Magness 218f0734be Rename removeTags to escapeTags 
rename function and update calls.
 2018-11-09 13:29:42 -05:00
Adam Magness 6827dbf734 bug fix 
Strings not String
 2018-11-08 12:59:00 -05:00
Adam Magness ffc406d819 normalise_link calls 
implement normaliseLink function
 2018-11-08 11:28:29 -05:00
Adam Magness 5276c28a78 link_compare calls 
implement compareLink function.
 2018-11-08 10:46:50 -05:00
Adam Magness 6fc9c6de3b base64url calls 
implement base64UrlEncode and base64UrlDecode functions
 2018-11-08 10:37:08 -05:00
Adam Magness 0efcbe5d15 protect_sprintf calls 
implement protectSprintf function
 2018-11-08 10:30:45 -05:00
Adam Magness a0f65ca7a1 notags calls 
implement removeTags function
 2018-11-08 10:14:37 -05:00
Adam Magness 991f259ecb random_string calls 
implement getRandomHex function
 2018-11-08 08:45:46 -05:00
Hypolite Petovan c464ec33e1
Merge pull request #6099 from annando/ap-emojis 
Using CSS for custom emojis
 2018-11-08 06:54:05 -05:00
Michael 077a96fb28 Using CSS for custom emojis 2018-11-08 07:42:19 +00:00
Hypolite Petovan 97b6d70825
Merge pull request #6096 from annando/ap-emojis 
We now directly support the custom emojis from Mastodon
 2018-11-07 20:10:16 -05:00
Michael cd2c7f782f We now directly support the custom emojis from Mastodon 2018-11-07 20:34:03 +00:00
Adam Magness e537f7d017 Function calls 
update function calls to new class
 2018-11-06 21:16:27 -05:00
Hypolite Petovan dd35cd0701
Merge pull request #6086 from friendica/fabrixxm-patch-1 
Fix Friendica node info json
 2018-11-06 10:48:00 -05:00
fabrixxm 0441a169a9 Fix code style 2018-11-06 16:37:58 +01:00
Adam Magness 4f07ebb52f Rename properly 
rename function properly this time!
 2018-11-06 06:34:32 -05:00
Adam Magness 3eecd108c5 rename function 
rename function and update calls.
 2018-11-06 06:31:48 -05:00
fabrixxm 1858204cbd
Stop PortableContacts to raise warning on malformed register_policy 2018-11-06 12:10:23 +01:00
Adam Magness a71eb1d127 functions moved to HTML class 
update function calls to moved class.
 2018-11-05 21:06:26 -05:00
Adam Magness 9e51be7554 Revert "Update function calls" 
This reverts commit 748fb8b946.
 2018-11-05 13:07:07 -05:00
Adam Magness 748fb8b946 Update function calls 
update function calls to new class
 2018-11-05 07:40:18 -05:00
Adam Magness b07d47b0f7 Update function calls 
update function calls to new names
 2018-11-05 07:24:14 -05:00
Adam Magness 61bc9facc8 Implement functions 
implement functions relocated to xml class
 2018-11-05 07:24:14 -05:00
Michael e759497af3 Fix small typo / Workerqueue count now only counts non deferred entries 2018-11-04 10:51:01 +00:00
Michael ec3cec37eb Fixes #6071: We should use the correct variable ... 2018-11-04 09:18:36 +00:00
Michael 8f27e3aeb1 Support for fetching non-public content / preparations for forum posts 2018-11-03 21:37:08 +00:00
Michael 1395bdc188 Preparations for a relocation message / fix for notice 2018-11-02 21:57:06 +00:00
Adam Magness d9b558a8ed Update function calls 
update function calls to new class.
 2018-10-30 14:51:45 -04:00
Adam Magness 50da89d861 Logger Levels 
update logger levels in calls
 2018-10-30 09:58:45 -04:00
Adam Magness 14fde5dc9b Log function 
implement log() function.
 2018-10-30 09:57:14 -04:00
Michael 84be62982a Diaspora signature transport via AP/DFRN should be repaired now 2018-10-29 21:15:37 +00:00
Michael 4831688dc0 Diaspora signatures are now stored and transmitted correctly 2018-10-27 14:35:22 +00:00
Michael 73f596cc46 Fixes duplicated transmissions and not working undo of like/dislike 2018-10-27 11:09:23 +00:00
Michael f2ddcbe632 AP: Event participation and editing of posts are now supported 2018-10-27 06:17:17 +00:00
Michael cbc417114d AP: We now transmit and process events 2018-10-26 04:13:26 +00:00
Michael 7f11b2e4e9 Deactivated BCC 2018-10-24 21:04:21 +00:00
Michael f300c8953a We now use bcc for the acl block 2018-10-24 20:06:57 +00:00
Michael 58f82e084d Preparations to work with BCC 2018-10-24 19:19:51 +00:00
Michael c25d60e107 Removed finished work from the comments 2018-10-24 04:51:37 +00:00
vinzv cb75c40f4e adapted profile pic resize to 300px for whole system 2018-10-23 16:36:57 +02:00
Tobias Diekershoff dbe49a0c1a
Merge pull request #5998 from annando/ap-queue 
Unsuccessful ActivitiyPub transmission are now deferred
 2018-10-23 06:54:11 +02:00
Michael e3e714a45f Unsuccessful ActivitiyPub transmission are now deferred 2018-10-23 03:54:18 +00:00
Hypolite Petovan e511790d62 Move NULL_DATE from boot.php to DBA::NULL_DATETIME 
- Add DBA::NULL_DATE constant
 2018-10-22 16:50:55 -04:00
Philipp Holzer d00ddc01af
Split goaway to System::externalRedirectTo() and App->internalRedirect() 2018-10-22 22:13:35 +02:00
Philipp Holzer 2ef81108b3
Renamed System::redirect() to $a->redirect() 2018-10-22 22:13:22 +02:00
Michael bb3f07b0b7 We now send the previous followers collection as well 2018-10-21 20:49:50 +00:00
Michael 1c54c27784 Bugfix: We hadn't deliverd AP posts to all intended receivers 2018-10-21 06:10:24 +00:00
Philipp Holzer 4392858662
Move Global Functions - Part 3 
- Replaced every CACHE definition
- Moved check_url to App->checkURL()
- Removed unused definition "ZCURL_TIMEOUT"
 2018-10-20 18:19:55 +02:00
Michael fea48fa85e AP: Transmitting and receiving with non AP contacts 2018-10-20 07:53:45 +00:00
Hypolite Petovan a2666b0d02
Remove reference to deleted include/security.php 2018-10-19 15:11:51 -04:00
Michael bedab33e0b Fix function naming 2018-10-19 13:08:46 +00:00
Michael cdeb4682ef Use nickname based mentions for AP 2018-10-19 05:27:54 +00:00
Hypolite Petovan eb714f0487 Diaspora: Widen the magic link regular expression 2018-10-18 22:39:06 -04:00
Michael 688174e6c0 AP: Fix "null" receiver 2018-10-18 12:25:57 +00:00
Michael 8035bad8e2 AP: Fix a notice / avoid an error when fetched content hadn't been an array 2018-10-18 05:54:44 +00:00
Hypolite Petovan 341b83d1df Fix Undefined index: photo in ActivityPub/Receiver 2018-10-16 18:29:28 -04:00
Hypolite Petovan cb854b8b10 Fix Undefined index: timezone in Protocol\Diaspora 2018-10-16 18:29:08 -04:00
Hypolite Petovan 2b1d15de87 Fix undefined index: id in Protocol\Diaspora 2018-10-16 18:28:27 -04:00
Michael 8d0f4710a4 Signed Diaspora posts should now be stored more reliable 2018-10-15 21:42:55 +00:00
Hypolite Petovan ce74a4d9a1
Merge pull request #5921 from annando/ap-video 
ActivityPub: Rudimentary support for videos
 2018-10-14 14:05:51 -04:00
Michael 37ad4a7d22 ActivityPub: Rudimentary support for videos 2018-10-14 17:57:44 +00:00
Hypolite Petovan 59d6dd809d
Merge pull request #5906 from annando/ap-switch 
OStatus contacts are now automatically converted to AP
 2018-10-14 12:04:52 -04:00
Michael 6be04a73e3 The outbox is now more complete / No more duplicates in the receiver array 2018-10-14 07:47:04 +00:00
Michael e829e074fc Location, coord and app are now processed as well 2018-10-13 21:37:39 +00:00
Michael aab4fa0c31 The instrument is now added, updating AP contacts is now enabled 2018-10-13 20:36:44 +00:00
Michael f60468677e We now transmit location and application as well. 2018-10-13 19:49:20 +00:00
Michael 8b9aa80aad "to" is now used for mentions, "cc" for everything else 2018-10-13 18:59:39 +00:00
Michael efad4936b0 OStatus contacts are now automatically converted to AP 2018-10-13 18:13:01 +00:00
Michael 3c48a1f787 AP: Announce will now work 2018-10-13 16:41:29 +00:00
Michael 5af0ee1b95 We can now store it without any problem 2018-10-12 18:53:13 +00:00
Hypolite Petovan 986528b77f
Revert "We now store the diaspora comment data as well" 2018-10-12 10:35:43 -04:00
Michael 8268288953 We now store the diaspora comment data as well 2018-10-11 20:38:57 +00:00
Michael 1bf7521af8 Store conversation data directly from the AP receiver 2018-10-11 20:08:04 +00:00
Philipp Holzer ffbc688797
Curl Response Refactoring 
- refactored Network::getCurl()
- replaced every Network::getCur() execution with a Curl Response
 2018-10-10 21:50:13 +02:00
Philipp Holzer 7c73e8634c
Curl Response Refactoring 
- refactored Network::post()
- replaced every Network::post() execution with the new Curl container
 2018-10-10 21:15:26 +02:00
Philipp Holzer 2dec8895a9
Curl Response Refactoring 
- extended Curl to parse Curl Response
- refactored Network::curl()
- replaced every Network::curl() execution with the new Curl container
 2018-10-10 21:08:43 +02:00
Philipp Holzer 5a02e39a65
Rename App Methods 
- renamed a lot of App methods to CamelCase
- replaced direct public variables with get-/set-Methods
 2018-10-10 00:16:06 +02:00
Hypolite Petovan 5f9dd11cfb
Merge pull request #5867 from annando/ap-fix-follow 
AP: Switchting existing contacts to AP when receiving activities
 2018-10-09 16:08:38 -04:00
Michael 0994aaf875 AP: Avoid a misleading log entry / unneeded field removed 2018-10-09 20:00:57 +00:00
Michael c0f26ace2e AP: Switchting existing contacts to AP when receiving activities 2018-10-09 19:58:15 +00:00
Michael b5d73f840c AP fixes: LD-signature, wrong owner for completed thres, account removal 2018-10-09 05:04:24 +00:00
Michael 4047952703 AP: Avoid an empty avatar field 2018-10-08 03:28:49 +00:00
Michael 46f77f3486 Detect the object type 2018-10-07 20:36:15 +00:00
Michael 93866b477a Several fixes 2018-10-07 19:42:04 +00:00
Michael bd6ba98e8d Some more cleanup 2018-10-07 18:41:45 +00:00
Michael 1efca1b75d owner is now actor 2018-10-07 17:35:43 +00:00
Michael 616c4a89bd The new parsing is now active 2018-10-07 17:17:06 +00:00
Michael 36c31e4091 Switching to parsing the JSON-LD 2018-10-07 15:34:51 +00:00
Michael 3a74f3364d Switch to parsing compacted JSON data 2018-10-07 13:37:05 +00:00
Michael 192c6c8d4f Preparation for suggestions under AP 2018-10-06 18:42:26 +00:00
Michael 389a651005 Transmit the Diaspora GUID with activities (Like, Dislike, ...) 2018-10-06 14:02:23 +00:00
Hypolite Petovan 2341ce353d
Merge pull request #5842 from annando/ap-distribution 
Improved AP distribution / Only process trusted content
 2018-10-06 09:35:44 -04:00
Michael a413ce15aa "name" must be plaintext 2018-10-06 13:28:17 +00:00
Michael 6b374c32a2 Improved AP distribution / Only process trusted content 2018-10-06 13:16:52 +00:00
Michael acf31ab64b Additional check to ensure that the owner of an activity is always the author 2018-10-06 09:38:51 +00:00
Michael 510032444f The owner of a "like" should be the author 2018-10-06 08:51:52 +00:00
Michael 41123162f1 No @brief anymore 2018-10-06 04:18:40 +00:00
Hypolite Petovan 13c5bc807b
Merge pull request #5829 from annando/develop 
Cache the AP delivery process
 2018-10-06 00:06:47 -04:00
Michael 9dbf8d0b9d Spaces 2018-10-06 02:09:27 +00:00
Michael 51dbffd396 Cache the AP delivery process 2018-10-05 21:00:40 +00:00
Michael 5d7968bdf3 Avoid to do the follow stuff for the public user 2018-10-05 20:10:10 +00:00
Michael 5ed1c12349 Send a follow request upon contact switch to AP 2018-10-05 19:48:48 +00:00
Michael fa7cddc669 AP Bugfix: Following a soapbox now works / rapid follow/unfollow should work now 2018-10-05 06:35:50 +00:00
Michael 3d74d412b2 Changed attachment handling to improve Mastodon compatibility 2018-10-05 04:04:37 +00:00
Michael 4368c922fb is sensitive 2018-10-04 13:08:11 +00:00
Michael 0ebfa6fc12 Added to-do 2018-10-04 12:57:42 +00:00
Michael 1c615f80c4 Improved return values 2018-10-04 12:53:41 +00:00
Michael 9171b2a0f3 It's possibly better to use context links that do exist 2018-10-04 09:46:29 +00:00
Michael 06a59c8312 Funkwhale documentation added 2018-10-04 05:29:22 +00:00
Michael 72fc89d033 Simplified attachment handling 2018-10-04 05:26:00 +00:00
Michael f6277970fa Added some to-do 2018-10-03 19:35:01 +00:00
Michael 11a7f6c3e1 Unused "use" removed 2018-10-03 19:17:40 +00:00
Michael cbfc3d0c28 Fix error / "about" is now converted to BBCode 2018-10-03 19:00:32 +00:00
Michael 221e197658 Tags are now transmitted as expected 2018-10-03 18:27:01 +00:00
Michael a9a1ac808b Attachments do work now 2018-10-03 17:36:55 +00:00
Michael 78a7e130ae Another renamed function 2018-10-03 15:50:21 +00:00
Michael 8841519c0d Renamed functions 2018-10-03 15:41:51 +00:00
Michael 1fe55679fc Moved documentation 2018-10-03 09:53:12 +00:00
Michael acd1caa114 The function is only needed in the same class 2018-10-03 09:45:54 +00:00
Michael 3ab837f3c7 Functionality is now split 2018-10-03 09:15:38 +00:00
Michael 4d2e5c2bbe AP class will be split in processor, receiver and transmitter 2018-10-03 06:15:07 +00:00
Michael 518d461a8f Issue 5811: "objects" instead of "object" 2018-10-02 20:12:38 +00:00
Michael 6020605d5c Account deletion could work now. 2018-10-01 19:22:13 +00:00
Michael 72c3a62e7f Profile update is now done via APDelivery 2018-10-01 05:44:56 +00:00
Michael 9f481c1f5e + is * 2018-09-30 20:48:29 +00:00
Michael 5456ef0185 Profile update and some more is now added 2018-09-30 20:26:30 +00:00
Michael 761bdafa34 Correct content type 2018-09-30 14:13:07 +00:00
Michael e71f497295 Renamed 2018-09-30 08:14:05 +00:00
Michael 2fc79e3886 Superfluous, since we only fetch this data 2018-09-30 07:48:13 +00:00
Michael 82987d018a Some changes for better code quality 2018-09-30 07:21:57 +00:00
Michael b043c7e0f2 Changed constant name to keep compatible with PHP 5 2018-09-28 15:25:20 +00:00
Michael da79566125 Relocated function 2018-09-28 03:56:41 +00:00
Michael 793387e2b5 Only communicate with contacts that aren't pending 2018-09-27 15:26:20 +00:00
Michael e01d5e4b31 Function naming ... 2018-09-27 11:56:05 +00:00
Michael cb9be8a7ab UUID is now createUUID 2018-09-27 11:52:15 +00:00
Michael 5639054699 Diaspora in AP - and changed function name 2018-09-27 11:39:17 +00:00
Michael fa868fbaf2 Some more documentation 2018-09-27 03:28:56 +00:00
Michael 897929ad40 Avoid warnings, added documentation 2018-09-26 22:45:13 +00:00
Michael f7d7d94111 Added some doxygen headers 2018-09-26 21:38:37 +00:00
Michael dd38b7e329 Avoid warnings 2018-09-26 20:36:47 +00:00
Michael 60b0759b50 UUID instead of GUID 2018-09-26 20:03:46 +00:00
Michael 9ec30010c5 APContact stuff is moved to an own class 2018-09-26 17:24:29 +00:00
Michael f3814ae1fc Changed conversation url (used for AP) 2018-09-26 13:12:27 +00:00
Michael 4699741f00 Fix delivery only for comments to native networks 2018-09-26 13:00:48 +00:00
Michael 67d2f8594c Some more clean up 2018-09-26 07:42:40 +00:00
Michael e91a1dfa8e Cleaned code 2018-09-25 21:18:37 +00:00
Michael 5e3f71680c Disabled logging 2018-09-24 21:47:10 +00:00
Michael 59c137b946 Variable fix 2018-09-24 05:35:47 +00:00
Michael b386add315 Switch contacts from OStatus to ActivityPub 2018-09-23 22:12:12 +00:00
Michael 094c27add6 Update person, undo activity and improved security checks 2018-09-23 19:25:20 +00:00
Michael 8c7e5bb776 all endpoints are now working 2018-09-23 17:29:31 +00:00
Michael feeec908d3 We can delete notes / changed credits 2018-09-23 09:20:25 +00:00
Michael 6df6d82427 We can now like and dislike 2018-09-23 08:52:07 +00:00
Michael a56565fa99 AP is enabled for all users 2018-09-22 23:49:27 +00:00
Michael ca574e1027 We can now like and dislike 2018-09-22 23:17:01 +00:00
Michael c083ae047c Merge remote-tracking branch 'upstream/2018.08-rc' into ap1 2018-09-22 15:18:53 +00:00
Michael 214407bdc8 Improve communication 2018-09-22 14:12:54 +00:00
Michael 0dbb6313a5 Hopefully fixes relocations that hadn't been executed 2018-09-22 06:47:35 +00:00
Michael b906b083bc The target inbox is now generated after the permission bloxk 2018-09-22 05:58:56 +00:00
Michael 71cbe56293 Use the follower collection 2018-09-22 04:49:16 +00:00
Michael b7744ae3eb Inherit the receivers from the previous post 2018-09-22 04:39:04 +00:00
Michael b44fc62708 Improvements to signature check, private posts do work now again 2018-09-21 22:31:33 +00:00
Michael 4c224fbddd Deliver everything to all receivers in the thread 2018-09-21 12:06:36 +00:00
Michael 5310d54c13 Fetch the receiver from the parent posting as well 2018-09-21 04:51:54 +00:00