1
0
Fork 0
Commit graph

4706 commits

Author SHA1 Message Date
b442f41159 Remove test code 2019-12-23 21:10:54 +00:00
00756737b5 Merge branch 'master' 2019.12 into develop 2019-12-23 20:03:47 +01:00
7fd1d674a9 Zot seems to work now 2019-12-23 15:07:49 +00:00
2306b949f2 Partly reworked, part 2 2019-12-23 14:30:48 +00:00
9cc2212b4b Restructuring code 2019-12-23 14:26:06 +00:00
4653d7d3b0 Renamed function, added documentation 2019-12-22 17:20:11 +00:00
03d6203410 We can now detect Hubzilla accounts 2019-12-22 08:13:12 +00:00
c975d0f799 Added documentation 2019-12-21 20:18:44 +00:00
537da657cc Renamed functions 2019-12-21 18:57:00 +00:00
33cb241ed3 Renamed function 2019-12-21 18:24:43 +00:00
26ac9a0063 "CheckServer" is now "UpdateGServer" 2019-12-21 18:11:51 +00:00
598f314577 Merge remote-tracking branch 'upstream/2019.12-rc' into poco-cleanup 2019-12-21 14:03:47 +00:00
1af52dd050 Fix: Newer Friendica servers had been detected as ActivityPub 2019-12-21 13:51:25 +00:00
90408b9d49 Discover directory type 2019-12-21 13:48:20 +00:00
fab85255b6 Relocated functions 2019-12-21 06:39:22 +00:00
4024d725db Fixed logger call 2019-12-21 04:23:26 +00:00
01205f7d41 Merge remote-tracking branch 'upstream/2019.12-rc' into poco-cleanup 2019-12-20 22:25:32 +00:00
a7c617cae2
Fixed:
- needs to be `prvkey`, not `prvKey`

Signed-off-by: Roland Häder <roland@mxchange.org>
2019-12-20 23:15:21 +01:00
c9c408d5e5 Fix notice because of a missing subject 2019-12-20 21:47:10 +00:00
b4f690839a "CheckServer" added 2019-12-20 21:46:30 +00:00
ef9bdfdff2 Fix some errors 2019-12-20 21:27:49 +00:00
3c4f44a4ab "FetchPoCo" added 2019-12-20 21:21:25 +00:00
e5546dd40a "UpdateServers" added 2019-12-20 21:12:44 +00:00
5fee84f2e2 Added "DiscoverContacts" 2019-12-20 21:04:38 +00:00
bf852cc096 "UpdateSuggestions" added 2019-12-20 20:49:09 +00:00
a1ad549e0b Added UpdateServerDirectory 2019-12-20 20:37:21 +00:00
37f0519514 'SearchDirectory' created (moved out of 'DiscoverPoco' mess) 2019-12-20 20:30:13 +00:00
75a62fc9e4
Merge pull request #7975 from annando/attach-newlines
Fix optical glitch: Replace multiple newlines when replacing attachments
2019-12-20 10:28:14 -05:00
81d500c271 Fix optical glitch: Replace multiple newlines when replacing attachments 2019-12-20 09:45:34 +00:00
88a39ea999 "gprobe" removed 2019-12-20 06:47:18 +00:00
33ea5dfe35 Add check for $_REQUEST key existence in Module\Item\Compose
- Addresses https://github.com/friendica/friendica/issues/7677#issuecomment-566254464
2019-12-19 07:48:08 -05:00
da78b7a8b8 API: Provide data for the account array of the instance array 2019-12-19 04:11:31 +00:00
Philipp
5197833c55
Merge pull request #7930 from MrPetovan/task/7887-api-followers-request
Add POST follow request Mastodon API endpoint
2019-12-18 22:12:52 +01:00
77e00f11a7 Add type-hint to debug null value fatal error
- Part of https://github.com/friendica/friendica/issues/7675#issuecomment-566076500
2019-12-16 11:05:08 -05:00
fd5b2d6af2 Fix wrong type-hints for table parameter in Database->selectToArray and DBA::selectToArray 2019-12-16 08:49:01 -05:00
c4e381fbd7 Issue 7953: Don't show follow/unfollow on the hovercard for the "self" contact 2019-12-16 06:35:29 +00:00
6e4a428c73
Merge pull request #7907 from nupplaphil/task/reduce_app_deps
Cleanup Session/Authentication
2019-12-14 09:53:40 -05:00
Philipp
1479c426c7
Merge pull request #7950 from annando/notice
Fix notice "Undefined index: href"
2019-12-14 11:00:04 +01:00
b2d17abc7b Fix notice "Undefined index: href" 2019-12-14 05:49:53 +00:00
Michael Vogel
eb4cfa65d8 Fixed warning 2019-12-14 06:42:40 +01:00
Michael Vogel
6ca38bac9f
Merge pull request #7944 from MrPetovan/bug/4451-escape-bbcode-blocks-autolinker
Escape potential URL-containing BBCodes before running autolinker
2019-12-13 21:10:57 +01:00
fe5b80b9ba Return early if user.uid isn't present in ACL::getFullSelectorHTML
- Addresses https://github.com/friendica/friendica/issues/7675#issuecomment-565533824
2019-12-13 13:29:18 -05:00
e1583123b4 Escape potential URL-containing BBCodes before running autolinker 2019-12-13 12:40:10 -05:00
b800083a2b Don't process empty hash tags in Model\Item
- Addresses https://github.com/friendica/friendica/issues/7677#issuecomment-565372628
2019-12-13 07:16:43 -05:00
ff3a0a0eba
Merge pull request #7939 from annando/issue-7659
Issue 7659: Display blocked and ignored public contacts as well
2019-12-12 11:07:57 -05:00
543c8f8459 Use localuser() 2019-12-12 15:57:08 +00:00
cc38250538 Improved RegExp 2019-12-12 14:57:31 +00:00
39560218f8 Issue 7659: Display blocked and ignored public contacts as well 2019-12-12 11:58:57 +00:00
e70743f72d Issue 7651: Added basic support for more complicated "video" elements 2019-12-12 05:35:30 +00:00
1408908c84
Refactor Session Handling (make it more simple & handler are now handler again) 2019-12-11 20:30:31 +01:00
e976bc0668 Log a message when data isn't the expected type in GContact::updateFromOutbox 2019-12-11 08:48:44 -05:00
9a0a11ed39 Improve Api\Mastodon\Account with data from apcontact
- Original work by @annando
2019-12-11 08:25:45 -05:00
cf72bde93d Ensure APContact::getByUrl always returns an array 2019-12-11 08:25:44 -05:00
2d47952921 Add POST follow request Mastodon API endpoint 2019-12-11 08:25:44 -05:00
1625330e70 Switch Api\Mastodon\FollowRequests to list introductions instead of pending contacts 2019-12-11 08:24:17 -05:00
0656e9ece4 Update web modules handling introduction to use new model class 2019-12-11 08:24:17 -05:00
c239d218d8 Update Base\Api::login to return the authentication status 2019-12-11 08:24:16 -05:00
919b1f45ab Add new Introduction model class 2019-12-11 08:24:16 -05:00
be93914c7d Move module post call before rawContent
- This was preventing API POST request to be processed
2019-12-11 08:24:16 -05:00
ff69fa1629 Add new BaseModel class 2019-12-11 08:24:16 -05:00
7716583912 Add Mastodon API entity Relationship class 2019-12-11 08:24:16 -05:00
1c69dda2e1
Merge pull request #7926 from annando/api-instance
API: Added endpoints /instance and /instance/peers
2019-12-11 04:07:49 -05:00
3388274f9a Removed unneeded function 2019-12-11 08:26:18 +00:00
203857ede0 Added parameter description 2019-12-11 06:54:31 +00:00
9296a55dfb Added entities 2019-12-11 06:51:59 +00:00
d994c91f38
Merge pull request #7929 from annando/apcontact-data
APContact: Added follower count, following count and count of posts
2019-12-10 19:58:25 -05:00
1baa4d48af Removed outcommented code 2019-12-11 00:10:25 +00:00
911a854255 APContact: Added follower count, following count and count of posts 2019-12-11 00:05:50 +00:00
4e2804d783 Added some more data 2019-12-10 23:05:25 +00:00
02c40ad1cb
Overwrite constructor of Memory session handling so no session ini-setting in backend/testing environments are possible 2019-12-10 23:35:16 +01:00
b085098b49
Make 2Factor "tel" field instead "number"
- because of missing copy&paste buttons at number
2019-12-10 22:44:45 +01:00
b9f8762eb3
Use Native Session functions (global "$_SESSION" variable) for Memory class because of the direct usage of the $_SESSION class all around the codebase 2019-12-10 22:29:49 +01:00
1958bde4c0 API: Added endpoints /instance and /instance/peers 2019-12-10 21:27:09 +00:00
eca3396851
rename usage 2019-12-10 21:52:23 +01:00
07d2909927
double use 2019-12-10 21:51:06 +01:00
Philipp
d0b20fb499
Merge pull request #7904 from MrPetovan/task/7887-api-followers-request
Add GET /api/v1/follow_requests Mastodon API endpoint
2019-12-10 15:53:06 +01:00
f4c94236c5
Merge pull request #7924 from annando/issue-7691
Issue 7691: We can now switch to BCC for ActivityPub
2019-12-10 08:36:07 -05:00
ce2610000b
Renaming class 2019-12-10 08:49:33 +01:00
a6c72a209e Issue 7613: When an item is deleted, delete all notifications for it 2019-12-10 06:21:18 +00:00
c6d422a188 Update Module\Help to use anchor words for titles
- Previous anchors are kept for links backward compatibility
2019-12-09 22:50:37 -05:00
8016cb3cee Add GET /api/v1/follow_requests Mastodon API endpoint 2019-12-09 22:50:36 -05:00
b365ffc3b5 Add API base module 2019-12-09 22:50:36 -05:00
2e9be55e51 Add Mastodon API entity classes 2019-12-09 22:50:35 -05:00
17838366a0 Reformat library/OAuth1
- Add type hints to Network\FKOAuthDataStore
2019-12-09 22:50:35 -05:00
26bd956912
Optimize L10n usage for Session (reduce "App" complexity even more) 2019-12-10 00:56:49 +01:00
cad7e534a4
Add phpdoc 2019-12-10 00:50:05 +01:00
555513e4b4
Add Session Management instances (including Depenency Injection)
- Prerequesite for mocking Sessions
- Reduce "App" class complexity
2019-12-10 00:44:56 +01:00
009a8bb939
Initializing SessionHandlers with Dependency Injection 2019-12-09 23:09:18 +01:00
94a8a60841
Add more Cookie tests (create new StaticCookie class for mocking setcookie()) 2019-12-09 22:47:08 +01:00
2a31b2383f Issue 7691: We can now switch to BCC for ActivityPub 2019-12-09 21:37:31 +00:00
49767e0555 Issue 7418: connections to forums should now work again 2019-12-09 21:19:20 +00:00
a8b89dc486
Remove copy&paste failure 2019-12-09 21:55:51 +01:00
f7e1cfd416
revert wrong import 2019-12-09 21:55:25 +01:00
b8f81d5e7d Relocate check for announce 2019-12-08 22:04:32 +00:00
1b0d2f2a4a Merge remote-tracking branch 'upstream/develop' into reshare-delivery 2019-12-08 21:56:51 +00:00
54392fab81
Move Cookie to own class (with tests)
Move Authentication to App namespace
2019-12-08 22:45:34 +01:00
38db4d2132 Fix a notice 2019-12-08 21:41:26 +00:00
fb64010d7a Missing "use" 2019-12-08 21:40:06 +00:00
aa047278cc Reversed annouce check to have priority for AP 2019-12-08 09:01:06 +00:00
7ccbe3ee29 Transmit reshares and announce natively via Diaspora and AP whenever possible 2019-12-08 08:59:21 +00:00
ca0a961ad2 Merge remote-tracking branch 'upstream/develop' into reshare-delivery 2019-12-08 08:49:47 +00:00
6728c58535 Mail contacts: Update public via user contact / display owner's posts 2019-12-08 05:19:15 +00:00
2b12cd473d
Merge pull request #7915 from annando/issue-7914
Fixes issue 7914: Reshares got crumbled
2019-12-07 16:53:50 -05:00
484b99f7cf Fix: Don't automatically mention a post creator on private posts 2019-12-07 21:42:55 +00:00
23cdc9cec8 Fixes issue 7914: Reshares got crumbled 2019-12-07 21:05:14 +00:00
b1fa0e8e26 ACL: Contact list is now sorted, forums reappeared 2019-12-06 07:25:21 +00:00
41f8796ffc Delivery of reshares 2019-12-06 06:39:50 +00:00
03e2b04e8f
Merge pull request #7910 from annando/notice
Fix a notice about an undefined "attach" index
2019-12-06 07:27:16 +01:00
4b2acb74d5 Fix a notice about an undefined "attach" index 2019-12-06 04:34:20 +00:00
7cfe05f849 Restore correct test for hidewall in ACL::getFullSelectorHTML 2019-12-05 20:05:47 -05:00
96555a7385
Refactor "Authentication" class with four main methods:
- withSession() - for auto authentication with Session/Cookie variables
- withOpenId() - for authentication with an OpenID account
- withPassword() - for authentication with Password
- setForUser() - for setting the user auth context of the current session

Refactor "Session" class - contains now "native" Session Management methods
2019-12-05 23:02:51 +01:00
18a3d18ba6
Move Authentication methods to class "Authentication" 2019-12-05 23:02:50 +01:00
5bb63e59e0
Move App::internalRedirect to BaseUrl::redirect 2019-12-05 23:02:50 +01:00
c28f1fec51
General usage of type in input fields 2019-12-05 21:42:33 +01:00
e6da666885
Make Two Factor Field numeric 2019-12-05 20:19:25 +01:00
4e77321be8 Replaced all preg calls in the calls with the new function 2019-12-05 06:42:10 +00:00
e435102089 Added logging, fixed indentation, call it from DFRN as well 2019-12-05 05:28:28 +00:00
838a233bfc Handling reshares of Friendica posts with titles via Diaspora 2019-12-05 05:11:14 +00:00
b9619ee89a Put the title in the body 2019-12-04 23:49:07 +00:00
22c66e1811 Add data for shared posts from the original 2019-12-04 22:57:09 +00:00
9a4240c3b2
Merge pull request #7898 from annando/ap-announce
Make quoted announces look better / more announce improvements
2019-12-04 11:24:42 +01:00
8f4f3e00e2 Return more data in the announce object 2019-12-04 09:36:46 +00:00
276d6fddd1 Function renamed - we don't return an object 2019-12-04 09:15:03 +00:00
ef3664e6d4 Check if reshared item is an AP item 2019-12-04 08:08:48 +00:00
abed3ba906 Remove unused function 2019-12-04 07:13:29 +00:00
d34052b332 Make quoted announces look better / more announce improvements 2019-12-04 07:02:39 +00:00
f989c331a3 Fix warnings about unexpected parameter array values type in ACL::getFullSelectorHTML
- Addresses https://github.com/friendica/friendica/issues/7676#issuecomment-560503744
2019-12-03 06:59:51 -05:00
3d701dd459 Only show the difference between posting and receive date when there is a difference 2019-12-03 07:23:01 +00:00
fd706cf9a7 Group selection: Respect "pubmail" and ignore atchived or blocked contacts 2019-12-02 23:04:11 +00:00
Philipp
6531819971
Merge pull request #7884 from MrPetovan/bug/7834-ignore-reload
Restore post reload after (un)ignore
2019-12-02 09:40:31 +01:00
01b81f7bba
Merge pull request #7885 from nupplaphil/bug/7881_allowed_themes
Themes are now saved just once
2019-12-01 08:12:20 -05:00
7ebd5e6b15
Themese are now saved just once 2019-12-01 08:43:50 +01:00
c3d88aca39 Update the return value of Item\Ignore to integer
- Array is unnecessary
2019-11-30 23:15:58 -05:00
d3c45f9186 Update type hint of System::jsonExit parameter to mixed
- Output isn't necessarily an array
2019-11-30 23:15:28 -05:00
461f7f4bb0 Assume hidewall key may be missing in ACL::getFullSelectorHTML
- Addresses https://github.com/friendica/friendica/issues/7677#issuecomment-559974588
2019-11-30 10:45:47 -05:00
3a7ef7893f Fix typo in ACL::getFullSelectorHTML 2019-11-29 15:55:52 -05:00
0ff4381305 Ensure the existence of expected default permission keys in ACL::getFullSelectorHTML
- Addresses https://sozialwolke.net/display/703b8751-145d-e11f-a923-98e999239905
2019-11-29 11:39:49 -05:00
25194b58b8 Initialize class members in App\Page
- Addresses https://github.com/friendica/friendica/issues/7676#issuecomment-559680658
2019-11-29 11:33:48 -05:00
0191f5242b
Merge pull request #7877 from annando/show-received
Show the received date along with the creation date of posts
2019-11-29 12:42:03 +01:00
02875df596 Show the received date along with the creation date of posts 2019-11-29 06:24:02 +00:00
Michael Vogel
2f2480d88d
Merge pull request #7876 from MrPetovan/task/7308-backport-compose-acl
Generalize the Compose ACL to the whole site
2019-11-28 21:24:20 +01:00
8f4f6899dd Update composer module to use the new ACL selector
- Remove ACL-specific code from compose-footer
- Move compose-footer template remaining content to compose.js
2019-11-28 12:54:56 -05:00
ae3d4f63a3 Use visibility tags input for the default ACL selector
- Move friendica-tagsinput to default view folder
- Update all references to ACL::getFullSelectorHTML
- Fix theme-specific issues with the new ACL
2019-11-28 12:54:53 -05:00
11da7f4095 Add new ACL::getContactListByUserId and ACL::getGroupListByUserId methods 2019-11-28 12:33:00 -05:00
440d3eb9c4 Simplify Theme::getPathForfile to expand its uses 2019-11-28 12:27:16 -05:00
e1f9dd5bb5 Merge remote-tracking branch 'upstream/develop' into nodeinfo 2019-11-28 16:10:18 +00:00
dba41da7e4
Merge pull request #7874 from annando/mail-post
Only transfer posts via mail
2019-11-28 16:30:31 +01:00
0979daddac Modules separated 2019-11-28 07:07:34 +00:00
7ffd6d0bc7 Attached photos from pixelfed are now added to the body again 2019-11-28 06:34:35 +00:00
22b89df348 Removed test logging 2019-11-27 22:00:43 +00:00
a6a79d9c7e Only transfer posts via mail 2019-11-27 21:59:11 +00:00
98d10b7253 Merge remote-tracking branch 'upstream/develop' into nodeinfo 2019-11-27 08:18:03 +00:00
cb37588375 We can always send via SMTP, receiving mails is via IMAP 2019-11-27 07:44:59 +00:00
ae306ea7de rss is inbound 2019-11-27 07:38:57 +00:00
054a111f3c Twitter is also inbound 2019-11-27 07:36:24 +00:00
a26689f69c remove unused variable 2019-11-27 07:32:46 +00:00
890bbfa1a7 We now support nodeinfo version 2 / basic nodeinfo data is always enabled 2019-11-27 07:25:54 +00:00
1531cad596 Fix a notice in gcontact.php 2019-11-26 19:03:21 +00:00
06a6774a7b Notice/warning in event fixed 2019-11-25 11:16:55 +00:00
67a0e97f7c Avoid contact update for non federated networks 2019-11-25 08:49:14 +00:00
fdaac8a681 Add "discourse" as protocol 2019-11-24 20:06:47 +00:00
99945f21cb Only read undeleted mails / improved structure 2019-11-23 20:02:21 +00:00
84244b1450 Now it works 2019-11-23 12:54:39 +00:00
fda30bbb1f Removed test data 2019-11-23 11:44:25 +00:00
e220698ea1 E-Mail import: The item is now provided to the hook 2019-11-23 11:42:03 +00:00
17c934aa07
Merge pull request #7859 from annando/mail-reply-to
Use the "reply-to" header of the original post when answering via mail
2019-11-22 23:33:10 -05:00
2dcf6d9e2b Now using the correct function call ... 2019-11-23 04:31:40 +00:00
37bdafcc96 Use the "reply-to" header of the original post when answering via mail 2019-11-22 22:15:04 +00:00
20dc285f9d
Merge pull request #7858 from annando/diaspora-date
Don't use the creation date when transmitting to Diaspora
2019-11-22 15:36:27 -05:00
Michael Vogel
f0ffc6df38 Don't use the creation date when transmitting to Diaspora 2019-11-22 21:24:02 +01:00
e539c74fa4 Removed the word "test" 2019-11-22 19:47:35 +00:00
5bf8c895a9 Improvement for PR 7854: Avoid leaking of BCC header data 2019-11-22 18:39:51 +00:00
d8da580869 Fix mail delivery via AP when the contact is hidden 2019-11-22 08:01:23 +00:00
d3e12c58e2 Fix some notices/warnings again 2019-11-21 22:40:54 +00:00
ade926afc6 Storing the mail header in the item 2019-11-21 15:28:18 +00:00
a6ae6a83b8 Added hooks for the email fetch process 2019-11-20 20:57:34 +00:00
7c1f8a0597 Renamed config name 2019-11-19 16:31:22 +00:00
fa876d770e Make the automatic title appending optional 2019-11-19 12:59:21 +00:00
Michael Vogel
100dfea524 Fix further notes and warnings 2019-11-19 11:02:35 +01:00
Michael Vogel
287c55722e Show title for posts with attached pages 2019-11-18 19:52:00 +01:00
Michael Vogel
80917018e9 Fix warnings 2019-11-18 19:09:21 +01:00
Michael Vogel
0733ae6aae Improve the look of fetched feeds and the BBCode processing of attachments 2019-11-18 13:29:27 +01:00
8644d300d0 Readded empty line 2019-11-17 18:12:20 +00:00
28ca0d6fab AP: Remove the link description from the "rich html" and adds it to the attachment 2019-11-17 18:10:12 +00:00
Michael Vogel
a3b7f08f78 Don't guess the site info / restrict the description length 2019-11-15 14:28:42 +01:00
fa57fead2e AP: Read different content types for the source and the content 2019-11-13 16:22:20 +00:00
85b3c880ef Fix: Mentions in the HTML part of the "contentMap" now are links 2019-11-13 06:43:36 +00:00
1fb485af1c Use the contentMap to transmit additional content encodings 2019-11-12 20:22:35 +00:00
8997361609 Better function name 2019-11-11 23:13:36 +00:00
1b5fa55bdc Fix image links with descriptions in API and AP transmission 2019-11-11 22:37:50 +00:00
babcd24412
[hotfix] Fix syntax error in Module\Register
- Prevents registration
- Addresses https://github.com/friendica/friendica/issues/7675#issuecomment-552070076
2019-11-09 01:09:26 -05:00
bdacda32ba Pinning: Missing file added 2019-11-09 03:17:18 +00:00
fc94cad5f2 Pinned posts now work for visitors in the intended way 2019-11-08 06:52:44 +00:00
2200996d44
[hotfix] Prevent fatal error in profile with pinned posts
- `$a->profile['profile_uid']` may not be set
- Addresses https://github.com/friendica/friendica/issues/7675#issuecomment-551255174
2019-11-07 15:51:05 -05:00
b8f2252a7f
Merge pull request #7823 from annando/pin
We can now pin posts
2019-11-07 15:10:03 -05:00
806e6a230e Added description, removed sorting 2019-11-07 07:41:54 +00:00
91ad7936f3 Only sort the profile after pinned 2019-11-07 07:39:50 +00:00
ed58af25a5 show pinned items 2019-11-07 06:53:18 +00:00
cf56992444 We can now pin our own posts 2019-11-07 05:39:15 +00:00
134d6d18f9 Pass Router parameter to module content method 2019-11-06 22:35:28 -05:00