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

6562 Commits

Author SHA1 Message Date
Michael 3fe7d035d4 Merge remote-tracking branch 'upstream/develop' into post-user 2020-11-17 23:31:41 +00:00
Michael Vogel dc5624b0b6
Merge pull request #9543 from MrPetovan/bug/notices 
Address several notices
 2020-11-18 00:30:31 +01:00
Hypolite Petovan 096cb19d12 Suppress notice when causer-id exists but not causer-link in Model\Item::isAllowedByUser 
- Address https://github.com/friendica/friendica/issues/9252#issuecomment-723440980
 2020-11-17 18:06:16 -05:00
Hypolite Petovan ccad67c68f Use correct contact key in Protocol\ActivityPub\Transmitter 
- Address https://github.com/friendica/friendica/issues/9252#issuecomment-719866843
 2020-11-17 17:59:39 -05:00
Hypolite Petovan 93380b8471 Suppress notice while logging in Model\Contact 
- Address https://github.com/friendica/friendica/issues/9252#issuecomment-716042132
 2020-11-17 17:57:37 -05:00
Hypolite Petovan 283b70928d Remove top-level parent check from Protocol\OStatus 
- It's done in Item::insert instead
- Address part of https://github.com/friendica/friendica/issues/9252#issuecomment-729171051
 2020-11-17 17:54:07 -05:00
Hypolite Petovan 54aef550c5 Remove superfluous mentions of parent-uri in Protocol\Diaspora 
- Address part of https://github.com/friendica/friendica/issues/9252#issuecomment-729171051
 2020-11-17 17:54:07 -05:00
Michael 7615c022be Improved logging 2020-11-17 22:41:53 +00:00
Michael 219c651289 Removed test logging 2020-11-17 22:38:52 +00:00
Michael eaa58da25b New table "post-user" and more foreign keys 2020-11-17 22:33:44 +00:00
Hypolite Petovan b2666e7794 Escape user name in introduction fields help text 
- HTML help text aren't escaped in the template

# Conflicts:
#	src/Module/Notifications/Introductions.php
 2020-11-16 18:21:11 -05:00
Hypolite Petovan ba0d3b2435
Merge pull request #9537 from annando/item-lock 
Fallback to database lock if locking fails
 2020-11-16 16:05:24 -05:00
Michael deb6b7a7c3 Fallback to database lock if locking fails 2020-11-16 19:46:20 +00:00
Hypolite Petovan a69c98e32f
Merge pull request #9535 from annando/ap-relay 
Relay code reworked to support AP delivery
 2020-11-15 20:27:08 -05:00
Michael 0384bf3e76 Relay code reworked to support AP delivery 2020-11-15 23:28:05 +00:00
Michael Vogel 42be636118
Merge pull request #9515 from MrPetovan/task/9464-block-replies 
Reject replies when author is blocked by thread owner
 2020-11-15 18:44:48 +01:00
Hypolite Petovan dbb33399bc Prevent image descriptions from being replaced by local smilies 
- AP-received emojis have their code in the image description
 2020-11-15 00:12:26 -05:00
Hypolite Petovan b5d3fcb8d4 Move top-level permission check outside of Model\Item::getTopLevelParentData 
- It wasn't checked when the direct parent was also the top-level parent
 2020-11-14 10:11:26 -05:00
Hypolite Petovan cb963a3259 Retrieve local top level parent item separately to check permissions in Model\Item::getTopLevelParentData 2020-11-14 10:11:26 -05:00
Hypolite Petovan 2e7c505ac0 Revert wrong item.thr-parent field usage in Protocol\OStatus 2020-11-14 10:08:52 -05:00
Hypolite Petovan 042f6b98ac Remove unnecessary data array assignment in Protocol\Feed 2020-11-14 10:08:51 -05:00
Hypolite Petovan 5ce8cc24de Clarify parameter type in DFRN::mail 2020-11-14 10:08:51 -05:00
Hypolite Petovan ff66633a44 Remove references to item.parent-uri in Worker\OnePoll 2020-11-14 10:08:51 -05:00
Hypolite Petovan a9d114316d Ensure the parent field isn't set during Item insertion 
- Avoid a database error if a null value is provided
 2020-11-14 10:08:51 -05:00
Hypolite Petovan d3708cf1c2 Fix wrong variable use in Model\Item::getTopLevelParent 
- It was preventing items at levels 3 and beyond to be inserted
- Logging for missing top level parent has been bumped to notice
 2020-11-14 10:08:51 -05:00
Hypolite Petovan 355cd401ae Replace uri fields conditions by gravity condition in Model\Item::insert 2020-11-14 10:08:51 -05:00
Hypolite Petovan ffc364f2a4 Reject replies when author is blocked by thread owner in Model\Item::insert 
- Move user-level item permission to Model\Item::isAllowedByUser
- Add user-level check for comments on top-level item
 2020-11-14 10:08:50 -05:00
Hypolite Petovan 0f2a5daf09 Replace confusing uses of item.parent-uri with expected item.thr-parent 2020-11-14 10:08:50 -05:00
Hypolite Petovan 0c3a5c815e Remove obsolete references to item.parent-uri 2020-11-14 10:08:50 -05:00
Hypolite Petovan d7e1ce47bb Use item.thr-parent as expected in Model\Item::insert() 
- Rework Model\Item::getTopLevelParent
- Backward compatibility with item.parent-uri is ensured
 2020-11-14 10:08:50 -05:00
Hypolite Petovan 490ce976c1
Merge pull request #9531 from annando/fatal 
Check for empty body to prevent a fatal error
 2020-11-12 13:41:26 -05:00
Michael ae363b74ad Check for empty body to prevent a fatal error 2020-11-12 16:52:55 +00:00
Hypolite Petovan 6dee10f340
Merge pull request #9530 from annando/fatal 
Fix fatal errors
 2020-11-12 07:57:53 -05:00
Michael 36c65643fb Fix fatal errors 2020-11-12 05:17:48 +00:00
Michael Vogel acae3df0a2
Merge pull request #9526 from MrPetovan/bug/9525-mastodon-emojis-tag 
Restore expected implementation of JsonLD::fetchElementArray
 2020-11-12 05:47:46 +01:00
Hypolite Petovan a8f16788f4 Prevent multiple replacements for the same emoji in Protocol\ActivityPub\Processor::replaceEmojis 2020-11-11 18:28:26 -05:00
Hypolite Petovan 42db861759
Merge pull request #9527 from annando/fetch-object-by-url 
Fix: Fetch object by URL
 2020-11-11 13:14:20 -05:00
Michael ba38ab2c55 Fix: Fetch object by URL 2020-11-11 17:55:33 +00:00
Hypolite Petovan fa003eaa84 Fix expected implementation of JsonLD::fetchElementArray 
- Added expected field value matching
 2020-11-11 11:19:08 -05:00
Michael Vogel 61dcd62921
Merge pull request #9522 from MrPetovan/bug/ap-blocked-followers 
Prevent ActivityPub message transmission to blocked followers
 2020-11-11 15:28:04 +01:00
Hypolite Petovan 0de8319c15 Filter blocked contacts out from Protocol\ActivityPub\Transmitter::getContacts 2020-11-11 09:18:51 -05:00
Hypolite Petovan 4fce6a919f Suppress notice when network page is empty 2020-11-11 03:05:12 -05:00
Hypolite Petovan 6b8c8b03c6 Prevent ActivityPub message transmission to blocked followers 2020-11-11 02:52:23 -05:00
Michael Vogel 7765bd8e43
Merge pull request #9512 from MrPetovan/bug/9501-admin-users-fixes 
[frio] Improve admin user list display
 2020-11-10 07:07:59 +01:00
Hypolite Petovan b1bc8ebbfa
Merge pull request #9517 from annando/no-duplicated 
Improve duplicate check
 2020-11-09 16:00:52 -05:00
Michael c4f1719e8d Improve duplicate check 2020-11-09 20:29:42 +00:00
Hypolite Petovan 8fe5da930a Only set the current notify as seen when user enabled detailed notifications 2020-11-09 11:41:21 -05:00
Hypolite Petovan a35707ec8f Improve admin user field is_deletable to check user.account_removed 2020-11-09 10:08:33 -05:00
Hypolite Petovan 7debe1e999 [AP] Use contact.alias if it exists instead of contact.url for mention links 
- Make mentions links handled by Mastodon for logged in users
 2020-11-08 23:32:02 -05:00
Hypolite Petovan edd439cfab Simplify code in Content\Text\BBCode::convert 
- Use performWithEscapedTags instead of custom solution
 2020-11-08 23:25:46 -05:00
Hypolite Petovan ae00111f5b Fix redirect/form paths in Module\Admin\Users\Index|Active 2020-11-08 20:09:10 -05:00
Hypolite Petovan ecb0c46323 Normalize mention formatting for AP 2020-11-08 14:21:20 -05:00
Hypolite Petovan 4b090c2c08 Never mention yourself in AP messages 2020-11-08 14:21:08 -05:00
Hypolite Petovan 388c0b69d6 Split admin/users into 6 separate modules 
- They now feature working pagination
 2020-11-08 12:53:12 -05:00
Hypolite Petovan 213716d44c Remove unused code in Module\Register 2020-11-08 12:53:12 -05:00
Hypolite Petovan 126ef0ae82 [frio] Add link to settings in account delegation page 2020-11-08 12:53:12 -05:00
Hypolite Petovan ffb4292b0b Improve accuracy of User::getList with type = blocked 
- user.blocked is used for pending registrations as well
 2020-11-08 12:53:12 -05:00
Michael 498dda7999 Fix parser issues when a video is linked without a matching extension 2020-11-08 09:24:01 +00:00
Michael eb8caaa5e7 Restore the connection check 2020-11-07 11:44:39 +00:00
Michael 8906615b2c Test if PDO doesn't work on the tests 2020-11-07 10:27:22 +00:00
Michael 84924d1c05 Test the tes 2020-11-07 10:12:31 +00:00
Michael d6a1a836f1 Simplified connection test 2020-11-07 09:58:20 +00:00
Michael 3a5cdecb62 New function to fetch the database driver 2020-11-07 09:02:02 +00:00
Michael 43749c3069 The "attach" field is now deprecated 2020-11-07 08:22:59 +00:00
Michael d383f49f1e The "[attach]" field is replaced by the "post-media" table 2020-11-06 04:14:29 +00:00
Hypolite Petovan bb99b0bebe Allow models extending BaseModel to have an id equal to 0 2020-11-05 10:03:40 -05:00
Hypolite Petovan c9c3d022bd
Merge pull request #9492 from annando/fix-fatal 
Handle fatal error when attachment url is null
 2020-11-04 09:56:53 -05:00
Hypolite Petovan 4e65b54b60
Merge pull request #9490 from annando/forum-fix 
Fix: Posts sent to forums had been rejected
 2020-11-04 09:56:20 -05:00
Michael 49fee4096a Handle fatal error when attachment url is null 2020-11-04 13:14:33 +00:00
Michael 29ec0bb98d Replaced debug log 2020-11-04 13:05:07 +00:00
Michael e5704eb05a Fix: Posts sent to forums had been rejected 2020-11-04 08:57:21 +00:00
Michael Vogel bf50f80399 Fix fatal error "Argument 2 passed to Friendica\Model\Post\Media::getAttachElement() must be of the type int, string given" 2020-11-04 07:58:04 +01:00
Michael 65b07aead4 Indention, documentation 2020-11-03 20:30:59 +00:00
Michael 4965d6aa54 The profile page does now shows reshared items 2020-11-03 19:24:47 +00:00
Hypolite Petovan 1e1d7a4411 Ensure we provide a mediaType string to Post\Media::getAttachElement 
- Address https://github.com/friendica/friendica/issues/9250#issuecomment-720101289
 2020-11-02 00:23:08 -05:00
Michael ba4685dfb1 API: Support for reshared items 2020-11-01 11:01:57 +00:00
Michael c030275815 API: accounts and trends 2020-10-31 22:32:26 +00:00
Michael 752f5b09d7 Use the raw body if not null 2020-10-31 16:32:41 +00:00
Michael e6030e5f82 API: Media attachments are now supported 2020-10-31 16:10:27 +00:00
Michael 42d246ef73 API: Media attachments are now supported 2020-10-31 16:09:27 +00:00
Michael 6b12ef14f5 Fixed spelling 2020-10-31 14:09:44 +00:00
Michael 8485c8c357 The post-media table now works with the "attach" field as well 2020-10-31 13:26:08 +00:00
Michael db8be13bbf Fix order on network page 2020-10-30 22:13:14 +00:00
Michael 5956de645d Improve expiry query 2020-10-30 20:26:16 +00:00
Michael da370c44ba Added lock for contacts, improved logging 2020-10-30 17:26:12 +00:00
Michael 930897046d Merge remote-tracking branch 'upstream/develop' into item-lock 2020-10-29 21:07:24 +00:00
Michael 46bd1704df Fix notice "Undefined index: network" and warning "strpos(): Empty needle" 2020-10-29 13:28:27 +00:00
Michael 56fe1400a7 Next renamed function 2020-10-29 09:03:06 +00:00
Michael e3df7eb131 Superfluous to-do removed 2020-10-29 08:50:35 +00:00
Michael 5ac73a847d Functions renamed 2020-10-29 08:48:08 +00:00
Michael e548d647aa New table for attached media files 2020-10-29 05:20:26 +00:00
Tobias Diekershoff 017bdd3fbb
Merge pull request #9460 from annando/issue-9457 
Issue 9457: Fix network order for starred and mention
 2020-10-27 11:25:16 +01:00
Michael a012234d82 Publish the provider fields in the API 2020-10-26 19:40:09 +00:00
Michael 2f3918c3a3 Issue 9457: Fix network order for starred and mention 2020-10-26 06:54:10 +00:00
Michael 44a4b66539 Improved self contact detection 2020-10-25 20:40:25 +00:00
Michael d8d96e6e61 Display the user fields for the admin account 2020-10-25 20:32:45 +00:00
Michael 319ceeda3b Publish the profile fields 2020-10-25 18:21:18 +00:00
Michael 463f8ee3f3 Use lowercase for tags 2020-10-25 17:59:28 +00:00
Michael 825189e8e9 Don't publish some fields 2020-10-25 17:42:42 +00:00
Michael 72efcc8169 "locked" is boolean 2020-10-25 16:59:38 +00:00