Commit graph

1113 commits

Author SHA1 Message Date
cb77b1af8c API: We now transmit the text description there as well 2019-08-04 03:45:23 +00:00
764c70720c Moved several database stuff out of the transaction to avoid error 1205 2019-08-03 10:36:21 +00:00
e5321ecc7f
Merge pull request #7458 from annando/fix-7449
Fix issue 7449: Image permissions are now set like before
2019-08-02 13:26:57 -04:00
bcadf19289 "contact-id" has to be set, after "author-id" had been set 2019-08-02 17:17:51 +00:00
7c10807d1d Clarified description 2019-08-02 16:59:26 +00:00
9819d31591 Merge remote-tracking branch 'upstream/develop' into contact-id-new 2019-08-02 16:52:34 +00:00
418009ffea Improved PR 7452: We now respect the "self" contact 2019-08-02 16:46:26 +00:00
01ef630322 Fixed description 2019-08-02 16:42:24 +00:00
d95ef96cca Fix issue 7449: Image permissions are now set like before 2019-08-02 16:38:50 +00:00
2e6b72ba62
Revert "Reworked contact-id generation" 2019-08-01 20:39:42 -04:00
Michael Vogel
e8459cce34
Merge pull request #7381 from MrPetovan/task/7309-frio-compose
[frio] New Compose page
2019-08-01 08:15:02 +02:00
88aa777410 Moved user block 2019-07-31 16:09:03 +00:00
c936232575 Added header 2019-07-31 16:07:50 +00:00
cdc44e26de Log level changed 2019-07-31 16:05:28 +00:00
b377906b77 Merge remote-tracking branch 'upstream/develop' into tag-deliver-delete 2019-07-31 14:11:06 +00:00
0696026380 Improved logging when item had been deliberately deleted after creation 2019-07-31 14:09:27 +00:00
8ddcd8417d Reworked contact-id generation 2019-07-30 22:02:32 +00:00
f010beaa95 Fix formatting in Model\Group
- Improve logging call
- Replace removed App->getDatabase call
2019-07-29 20:31:50 -04:00
361958ad04 Replace removed Contact::select by Contact::selectToArray
- Add explicit DBA::close in Model\Group
2019-07-29 20:31:49 -04:00
c149ba2d59 Replace $uid parameter by $obj['uid'] in Item::enumeratePermissions 2019-07-29 20:31:49 -04:00
3e6018b3f2 Add meta protocol group for private post support 2019-07-29 20:31:48 -04:00
4e427f615b Only include natively supported protocol contacts in meta-groups 2019-07-29 20:31:48 -04:00
0579252362 Add user meta-groups for followers and mutual contacts
- Both Group::expand and Item::enumeratePermissions now have a user id parameter to expand meta-groups
2019-07-29 20:31:46 -04:00
50f3098495 Revert adding DBA::toArray to Item::selectToArray 2019-07-28 00:12:49 -04:00
3334a3d497 Fix indent in Model\Item 2019-07-28 00:06:05 -04:00
a61ce4fed0 Ensure *toArray returns an array 2019-07-28 00:03:42 -04:00
Philipp Holzer
2f5928f43a
Refactoring Profile:: selectors 2019-07-28 00:19:38 +02:00
Philipp Holzer
7613704d2f
improve Profile model 2019-07-27 23:56:54 +02:00
Philipp Holzer
2a87464c97
Replace q() call with Profile::get() method 2019-07-27 23:54:12 +02:00
f48452dd29 Some more 2019-07-27 16:57:00 +00:00
580f9cf6c7 Replaced some " with ' 2019-07-27 16:53:48 +00:00
1a3bf05dfb Changed "Contact::select" to "Contact::selectToArray" 2019-07-27 15:57:23 +00:00
89454fabdb Changed "Photo::select(" to "Photo::selectToArray(" 2019-07-27 15:52:02 +00:00
ac6bfd3e4c Changed Attach::select to Attach::selectToArray 2019-07-27 15:47:17 +00:00
2be0ceac6b Added "selectToArray" functions in DBA and Item 2019-07-27 14:33:17 +00:00
e256876ec1 Support for empty nick names 2019-07-24 19:30:36 +00:00
64b10205bc
Merge pull request #7420 from annando/reshare-contact
Fix contact issues with fake reshares from Twitter
2019-07-23 05:05:44 -04:00
2a213c215e Fix contact issues with fake reshares from Twitter 2019-07-23 04:26:20 +00:00
cd257dc7e8 Enable app-specific password authentication for API login 2019-07-22 07:56:36 -04:00
1a164b0dc5 Add two-factor app-specific password settings page
- Add two-factor app-specific model
- Add link to new page from 2fa settings index page
2019-07-22 07:56:00 -04:00
a149d6ec44 Move recovery code model to sub-folder 2019-07-22 07:41:01 -04:00
53ffe5a2e1 Fetch Diaspora posts by url 2019-07-21 07:37:50 +00:00
931c190566 Removed test output 2019-07-18 06:20:54 +00:00
41a1c1c3e6 Fetch items by given uri 2019-07-18 06:11:02 +00:00
e247a14d2b Added the option to only receive top level posts from people you follow 2019-07-17 21:37:13 +00:00
19247b62ae Ensure $uid parameter of Feature::isEnabled to be an integer 2019-07-15 22:00:49 -04:00
d1c048cd4b
Fix typo in Model\Config\PConfig 2019-07-15 16:32:13 -04:00
Philipp Holzer
ebf00e32a1
minor phpdoc fixings 2019-07-15 20:54:33 +02:00
Philipp Holzer
9d98a4ce3a
Refactor PConfiguration 2019-07-15 20:13:53 +02:00
6c68b8359d
Merge pull request #7372 from nupplaphil/task/simplify_config
Refactor Configuration (Simplify Config Part 3)
2019-07-14 19:05:09 -04:00
Philipp Holzer
aa249adf6d
some more minor fixups (phpdoc, unused using) 2019-07-14 22:49:17 +02:00
Philipp Holzer
c293eadb78
Improve & fixing Tests 2019-07-14 22:12:11 +02:00
Philipp Holzer
486f139342
Move Preload/JIT Configuration logic from Adapter to Core-Configuration 2019-07-14 22:09:07 +02:00
83729b8c00 "defaults" is replaced 2019-07-14 16:04:52 +00:00
9ba3ee13a8 Use an insert to avoid duplicates and for analyzing 2019-07-14 10:22:19 +00:00
2df17fc0c0 Fix SQL problem with "not null" 2019-07-13 07:39:53 +00:00
002963f198 Fix wrong variable 2019-07-13 07:29:56 +00:00
9b8396620b Fix duplicated contacts due to relay probing 2019-07-13 07:25:01 +00:00
7dfadf7e7e Simplify the contact update in "getIdForURL" 2019-07-12 21:07:47 +00:00
8cbdc7939e Fetch more comtact data from probing, remove duplicated contacts 2019-07-12 14:55:23 +00:00
6bb418c5a7 Use "received" instead of "created" when displaying posts in creation order 2019-07-07 21:30:33 +00:00
dda86f6dfc Basepath function now uses the contact field 2019-07-05 06:41:48 +00:00
be0a102333 Simplified the Contact update 2019-07-04 21:19:23 +00:00
c9666a9f1d We don't update inside the probing anymore 2019-07-04 19:40:48 +00:00
8d6aa9914c We now handling the contact type 2019-07-04 19:31:42 +00:00
ef5be9668f New fields in contact table / don't update on probe 2019-07-04 04:08:55 +00:00
7b0a9ffd89 Update gcontact when public contact is updated 2019-07-03 05:46:35 +00:00
80c3a81618 Use the term-date as archive date 2019-07-02 14:46:04 +00:00
1d7154a7d1 Update the gcontact entry when the public contact entry has changed 2019-07-02 09:06:48 +00:00
ee8baf00ce Now without array_merge 2019-07-01 22:14:34 +00:00
9e3aff9ade Removed comment line 2019-07-01 18:09:40 +00:00
6041f74df6 New constant for federated protocols 2019-07-01 18:00:55 +00:00
3121d967c5 Item delivery data must only be stored when there is data 2019-06-29 08:30:48 +00:00
9bf065c9d8 Merge remote-tracking branch 'upstream/develop' into delivery-statistics 2019-06-28 14:08:54 +00:00
7b4bba66db
Merge pull request #7323 from annando/contact-discovery
Removing functionality from OnePoll.php
2019-06-28 07:08:57 -04:00
0a15222576 Collect data about used protocols for delivery 2019-06-28 09:03:58 +00:00
8838a1f2d1 Avoid overwriting of avatars for feeds 2019-06-28 04:26:49 +00:00
4db3c79d04 Archive/unarchive the contacts 2019-06-27 05:03:58 +00:00
Dean Townsley
fdbd160141 Add spaces for standards compliance 2019-06-24 21:37:44 -05:00
Dean Townsley
59553ab978 Don't try to auth for public images 2019-06-24 19:45:50 -05:00
bca1dc1ca4 Moving functionality to the contact model 2019-06-24 03:25:01 +00:00
037cf01a15 Merge remote-tracking branch 'upstream/master' into contact-discovery 2019-06-24 03:23:57 +00:00
fa191bd821
Merge pull request #7305 from deantownsley/imageauthfix
Make authentication work for local private images
2019-06-23 15:18:15 -04:00
Michael Vogel
9559266075 todo added 2019-06-23 12:01:14 +02:00
857469d16a Constantly updating public contacts 2019-06-23 09:27:40 +00:00
Michael Vogel
f84e2e9d93 Fix for distribution of event deletions 2019-06-23 08:41:49 +02:00
Dean Townsley
b5e195b415 Add auth to load sequence for photos
This allows private photos to load on any page.  Previously auth
depended on some other thing like the enclosing page triggering the
authentication of the specific contact for the photo owner.
2019-06-22 12:24:30 -05:00
14c28868eb Issue 6477: Use the correct content-type to resize the images 2019-06-20 20:09:33 +00:00
f0849b0a93
Merge pull request #7284 from annando/fix-fatal
Don't send activities to "null" endpoints
2019-06-19 23:42:21 -04:00
2e4e8bdf0a Don't send activities to "null" endpoints 2019-06-20 03:06:34 +00:00
2ba4116118
Merge pull request #7282 from annando/issue-6477
Issue 6477: Automatically repair self contact avatar
2019-06-19 16:12:56 -04:00
f878cc2623 Fix for PR 7280 2019-06-19 18:38:22 +00:00
b55546b726 Merge remote-tracking branch 'upstream/2019.06-rc' into issue-6477 2019-06-19 18:26:59 +00:00
6bd5be281e Normalise it 2019-06-19 17:21:35 +00:00
4ab772ed67 Issue 6477: Automatically repair self contact avatar 2019-06-19 17:05:29 +00:00
b48a49b0f5 Added timeout 2019-06-18 08:05:45 +00:00
ea90554e7f Fix the base url detection of AP profiles 2019-06-18 07:47:21 +00:00
496910e750 Issue #5983: Ignore reshares from blocked and ignored contacts 2019-06-17 11:55:19 +00:00
14725bbd6a Fix undefined index addr notices in Model\Contact::getIdForURL
- Addresses https://github.com/friendica/friendica/issues/6918#issuecomment-502393030
2019-06-15 17:16:10 -04:00
f6f22378f1 Ignored stuff must be stored. 2019-06-14 18:34:17 +00:00
2482072457 Issue 5983: Central check for blocked and ignored contacts added 2019-06-14 05:25:10 +00:00
5b291abc7f Restore show_connect flag in Model\Profile::sidebar 2019-06-13 03:26:42 -04:00
Philipp
6c6e3058f2
Merge pull request #7260 from annando/sanitize-input
Sanitize the date for mails
2019-06-13 09:11:41 +02:00
20eb7ae73f Empty dates are now set to today as well 2019-06-13 05:43:00 +00:00
6970fb2862 Issue 7142: Prevent respawn of "remote self" items 2019-06-13 05:06:52 +00:00
2ae4371606 Sanitize the date for mails 2019-06-13 03:22:15 +00:00
422ebb5d58 Fix notice in Model\Profile 2019-06-12 19:41:15 +00:00
Philipp
fb63274aaf
Merge pull request #7250 from MrPetovan/bug/6410-normalize-message-button
Normalize message button in profile sidebar
2019-06-12 17:56:05 +02:00
304c144bc2
Use App::getBaseURL instead of System::getBaseURL in Model\Profile::load
Co-Authored-By: Philipp <admin+Github@philipp.info>
2019-06-12 10:56:41 -04:00
76a420fbe9 Avoid fatal error when AP contact has no photo 2019-06-11 05:26:16 +00:00
3aebb92cf3 Rework Profile::sidebar profile link conditions
- Now show Follow, Unfollow, Atom Feed and Message in profile sidebar more consistently with the status of the current visitor
- Remove pseudo-field contact.remoteconnect
2019-06-10 21:56:03 -04:00
61c79ce9ee Add new Model\Contact::canReceivePrivateMessages method 2019-06-10 21:29:11 -04:00
0fbfb7c970 Prevents an endless loop when only the non-public contact is available in Contact::magicLinkByContact 2019-06-10 19:10:39 -04:00
d7d44e1af7
Merge pull request #7245 from annando/unify-constants
Fix delivery counter for poking / unify delivery commands
2019-06-10 11:59:40 -04:00
41dc243186 Fix delivery counter for poking / unify delivery commands 2019-06-10 14:19:24 +00:00
165607ffe7
Merge pull request #7242 from nupplaphil/bugs/6917-php_warning
Add typed parameter for methods in `Friendica\Util\Network`
2019-06-10 09:22:27 -04:00
Philipp Holzer
cc7444d84d
Move internal recursion-counter to the end of all cur/fetchUrl parameters 2019-06-10 14:34:54 +02:00
1c6bf7d25a Add App parameter to Module\Profile::sidebar method prototype 2019-06-10 08:21:06 -04:00
Philipp Holzer
236c0dc248
Check $contact['id']
- see https://github.com/friendica/friendica/issues/6918#issuecomment-498043313
2019-06-10 12:36:42 +02:00
44a49a8d7d Ensure that pokes are always send only via DFRN 2019-06-06 04:26:02 +00:00
f0de19dd8a
Merge pull request #7208 from nupplaphil/bug/6916-filetag
Adding null checks before FileTag method (fix fatal)
2019-05-31 01:47:52 -04:00
Philipp Holzer
c76258c370
catching nulls for FileTag 2019-05-30 13:54:35 +02:00
Philipp Holzer
694cd82d0e
Bugfix - author-network (adding to unset list during insert) 2019-05-29 21:48:03 +02:00
Philipp Holzer
7334be803d
Bugfix - item_id 2019-05-29 21:40:21 +02:00
Philipp Holzer
766a10b3b6
Adding author-network to ITEM::ITEM_FIELDLIST
see https://github.com/friendica/friendica/issues/6918#issuecomment-493515358
2019-05-29 20:09:20 +02:00
Philipp Holzer
15ffb70c5f
Adding item_id to Item::ITEM_FIELDLIST
see https://github.com/friendica/friendica/issues/6918#issuecomment-493515358
2019-05-29 20:08:21 +02:00
Philipp
9245942a0c
Merge pull request #7199 from MrPetovan/bug/7171-filer-network
Allow commas in saved folder names
2019-05-29 07:03:44 +02:00
Philipp
e557457158
Merge pull request #7201 from annando/mail-db-error
Fix Issue 7196
2019-05-28 20:02:39 +02:00
ae940755c7 Fix Issue 7196 2019-05-28 17:39:26 +00:00
6de3449cae Add new fileToArray and arrayToFile methods to Module\FileTag 2019-05-27 17:38:36 -04:00
96402e306a Fix formatting of Model\FileTag
- Normalize indent style
- Remove extraneous new lines after ifs/foreachs
2019-05-27 17:38:32 -04:00
Philipp
5c2cca432f
Merge pull request #7170 from MrPetovan/bug/6981-contact-request-blocked
Contact requests blocked
2019-05-25 20:20:36 +02:00
14a78807d7 Use self::isBlocked and self:isBlockedByUser in Model\Contact::addRelationship 2019-05-20 16:34:17 -04:00
62dfcbb074 Prevent contact relationships with node- or user-level blocked contacts 2019-05-20 15:29:20 -04:00
ea77f214d7 Add return value to Model\Contact::addRelationship to remove protocol-specific code from it 2019-05-20 15:29:20 -04:00
3114754f4b Refactor Model\Contact::addRelationship
- Remove unused parameter $item
- Replace q() call with DBA::insert
- Update check on $contact that can only be an array now
- Add moethod doc block
2019-05-20 15:29:20 -04:00
c65faecc8c Add current tab parameter to Model\Profile::getTabs 2019-05-20 15:09:33 -04:00
709eba6ce3 Move /viewcontacts to /profile/{nickname}/contacts[/{type}]
- Add contact relationship filter to profile contacts page
- Include feed contacts in contacts page and contact widget
2019-05-20 14:50:09 -04:00
Philipp Holzer
5f068b07f9
some improvements 2019-05-19 03:12:22 +02:00
Philipp Holzer
8bb85b1da7
Move mod/randprof to src/Module/RandomProfile 2019-05-18 22:17:57 +02:00
79cb5b1bae Add block reason editing in Model\Contact 2019-05-15 19:28:00 -04:00
a14f868134 Make Module\TwoFactorRecoveryCode::markUsedForUser return false for already used code
- Add PHP Doc in Module\TwoFactorRecoveryCode
2019-05-13 13:32:21 -04:00
a7feb4bf9f Add Two-factor recovery code model
- [DBA] Add NULL value handling in condition array
2019-05-13 01:52:00 -04:00
f04bb820ad Magic links should work again 2019-05-10 07:38:10 +00:00
d9f6a58229 Mail: Set the "reply" value when it is a reply 2019-05-09 20:52:52 +00:00
b8a23369b6 Mail storing is now centralized 2019-05-08 05:44:22 +00:00
626709159f Some cleaning up 2019-05-06 18:46:30 +00:00
bb8d297ae4
Merge pull request #7097 from nupplaphil/task/mod_after_PR_fixing
Fixings for Mod-Refactorings
2019-05-05 20:28:57 -04:00
8af0ae171e
Merge pull request #7083 from nupplaphil/task/mod_friendica
Move mod/friendica to src/Module/Friendica
2019-05-05 14:19:57 -04:00
039f9490dd
Optimized Profile::searchProfiles & Bugfix Contact::getProbeDataFromDatabase 2019-05-05 18:40:36 +02:00