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

2518 Commits

Author SHA1 Message Date
Michael b160aa07b6 Issue 9705: Perform an age check when the post isn't fetched 2021-01-11 20:00:51 +00:00
Michael 050f31eeb3 Don't try legacy if the server supports more 2021-01-10 19:08:23 -05:00
Michael bf563a1a39 Store the server transport protocol 2021-01-10 19:08:23 -05:00
Michael 6401bd7503 Mark if post was received via relay 2021-01-09 16:56:42 +00:00
Michael 2987070d93 Improved direction and protocol detection 2021-01-09 12:59:30 +00:00
Michael c0ac120578 Issue 9736: Fix for undroppable registrations 2021-01-02 09:11:38 +00:00
Hypolite Petovan a12380a247
Fix typo in Model\Event 2020-12-30 09:20:46 -05:00
Michael c5c9fda93c Improved logging, avoid fatal error 2020-12-30 07:13:47 +00:00
Michael a294c19d6e Fix several notices 2020-12-29 21:38:23 +00:00
Michael 997319a41f Use the raw data instead of an object 2020-12-26 19:31:39 +00:00
Michael 7f56e2e7a9 Improve photo loading speed 2020-12-26 18:51:36 +00:00
Hypolite Petovan f0eeb4900f Add support for Unicode in Model\Tag::store 2020-12-24 05:09:38 -05:00
Hypolite Petovan 586fb10176
Merge pull request #9697 from annando/improved-server 
Server detection: Handle redirects, better Peertube detection
 2020-12-22 11:14:07 -05:00
Michael ae8a376eab Fix wrong variable 2020-12-22 08:24:56 +00:00
Michael a5096ea549 Server detection: Handle redirects, better Peertube detection 2020-12-22 08:12:36 +00:00
Hypolite Petovan 2ef4972782 Fix capitalization of Contact::magicLinkById calls 2020-12-22 01:01:43 -05:00
Hypolite Petovan 1414d43597
Merge pull request #9664 from annando/delete-contacts 
Delete removed contacts
 2020-12-16 11:28:56 -05:00
Michael a331a8cf0a Delete removed contacts 2020-12-15 22:56:46 +00:00
Hypolite Petovan 6d3864a16b
Remove owner.deleted check in user deletion check in Model/Item 2020-12-15 14:24:42 -05:00
Hypolite Petovan 0951a50bcd Add item user owner data check in Model\Item::isValid 
- Prevents deleted users from posting any item, manually or automatically through mirroring
 2020-12-15 09:41:58 -05:00
Hypolite Petovan 8c17a6b4d9 Rename Model\User::getOwnerDataById parameter to better reflect intent 2020-12-15 09:41:10 -05:00
Michael Vogel e4228c6218
Merge pull request #9655 from MrPetovan/bug/fatal-errors 
Fix several occasional fatal errors
 2020-12-14 22:11:45 +01:00
Hypolite Petovan 0441b912ac Return early if an URI id cannot be obtained in ActivityPub\Processor::createItem 
- Address https://github.com/friendica/friendica/issues/9250#issuecomment-743769813
 2020-12-13 13:42:08 -05:00
Michael cd96955fcf Fix: posted unprepared posts hadn't been deleted 2020-12-13 18:17:50 +00:00
Michael d938e37767 Set the return value 2020-12-13 17:22:50 +00:00
Michael 4626f98dbe Added logging 2020-12-13 16:38:12 +00:00
Michael 0eb4a600b0 Delay unprepared posts 2020-12-13 12:47:49 +00:00
Hypolite Petovan c787281eff
Merge pull request #9652 from annando/issue-9584 
Issue 9584: Only search posts from federated networks
 2020-12-12 15:13:31 -05:00
Michael c3d0ab56a5 Issue 9584: Only search posts from federated networks 2020-12-12 19:55:47 +00:00
Michael 297118f902 Archive/Unarchive at ActivityPub delivery 2020-12-12 16:45:23 +00:00
Hypolite Petovan 99b200868b Normalize return value in Database->fetch 
- Address https://github.com/friendica/friendica/issues/9250#issuecomment-741857058
 2020-12-10 06:12:10 -05:00
Michael dd94fb1242 Check for bad worker priorities 2020-12-08 21:58:32 +00:00
Michael e17ca9cc35 Check for remote default avatars as well 2020-12-07 07:14:09 +00:00
Michael a49a35f459 Centralized fetching of the default avatar 2020-12-07 06:43:43 +00:00
Michael 9acecfd9e6 Issue 9630: Prevent negative values for registered users 2020-12-06 18:14:05 +00:00
Michael Vogel f9994548c1
Merge pull request #9621 from MrPetovan/bug/9611-bbcode-convert-html-purify 
Add HTML Purify to BBCode::convert
 2020-12-05 19:27:59 +01:00
Hypolite Petovan 1cc509c5ef Move BBCode version tagging inside of the hash to prevent item-content.rendered-hash overflow 2020-12-04 08:30:51 -05:00
Hypolite Petovan e712706302 Add BBCode versioning 
- This will trigger the re-conversion of displayed items on version update
 2020-12-04 07:29:49 -05:00
Michael 9f96f3ef34 Moved updating personal contacts to updatecontact 2020-12-04 05:53:11 +00:00
Michael 8d999f54d0 Check and add a server 2020-12-03 22:32:51 +00:00
Michael 0c9a0ce64e Merge remote-tracking branch 'upstream/develop' into worker-command 2020-12-03 15:48:46 +00:00
Michael edbdfbae6b workerqueue now has a "command" field 2020-12-03 15:47:50 +00:00
Michael c1d1b189f7 Cleaned code 2020-12-02 08:36:23 +00:00
Michael 775075c5db Only spool mirrored posts 2020-12-02 05:07:44 +00:00
Michael b2dadf0f92 Use a combined unique index 2020-12-02 00:34:10 +00:00
Michael 4fbd0a46b5 Reducing parameter list 2020-12-02 00:05:03 +00:00
Michael a283b1183b Move deletion 2020-12-01 23:04:04 +00:00
Michael Vogel b3f71d174c Added logging 2020-12-01 23:54:49 +01:00
Michael 2aa302c570 New class for handling delayed posts 2020-12-01 22:11:29 +00:00
Michael bb823c323b Configuration for the priority of the notification for expired messages 2020-11-30 21:40:55 +00:00
Hypolite Petovan 4f98da88c4
Merge pull request #9614 from annando/issue-8943 
Issue 8943: Only check for too old postings for feeds
 2020-11-30 16:09:27 -05:00
Michael b30d2c9c6b Renamed function 2020-11-30 20:59:18 +00:00
Michael ccc07b06de Issue 9329: prevent "Expression #1 of SELECT list is not in GROUP BY clause" 2020-11-30 20:44:21 +00:00
Michael 8bc799ff38 Issue 8943: Only check for too old postings for feeds 2020-11-30 20:32:56 +00:00
Michael 5f1ea39bad Display posts that are reshared by the contact 2020-11-29 20:42:03 +00:00
Michael 7ab63d2106 Store the protocol of the received message 2020-11-29 09:01:51 +00:00
Michael 8da8d3c4fd Only automatically reshare items from DFRN and AP 2020-11-29 00:05:46 +00:00
Michael bda5d43f1e New "remote self" option: Native Reshare 2020-11-28 22:53:58 +00:00
Michael bd9f36622e Cast field data when ATTR_EMULATE_PREPARES is enabled 2020-11-27 11:24:31 +00:00
Michael 818c064c0a The notifications parameters are now simplified 2020-11-25 19:56:39 +00:00
Michael 495252690b available is not vital 2020-11-24 07:49:36 +00:00
Michael e4e9a20ac8 Don't transmit to archived inboxes 2020-11-23 19:25:22 +00:00
Michael 3ffd40c7da OnePoll reworked, improved "failed" behaviour 2020-11-22 14:42:24 +00:00
Hypolite Petovan 1acc5ffb38
Merge pull request #9553 from annando/insert-mode 
Mode switch for insert
 2020-11-19 16:25:09 -05:00
Hypolite Petovan 10a4802d81
Merge pull request #9552 from annando/zero-user 
Avoid problems with uid=0
 2020-11-19 16:23:28 -05:00
Michael 303aaa00ca Mode switch for insert 2020-11-19 19:34:48 +00:00
Michael bd0e2dc0a8 Avoid problems with uid=0 2020-11-19 17:19:14 +00:00
Hypolite Petovan a66e66359c Make Model\User::getAuthenticationInfo accessible to addons 
- It contains the centralized authentication requirements for user records
 2020-11-19 11:20:17 -05:00
Michael b09ffa0697 Relocate system user creation 2020-11-18 05:33:17 +00:00
Michael fed1ace311 Fix condition 2020-11-17 23:59:14 +00:00
Michael 3fe7d035d4 Merge remote-tracking branch 'upstream/develop' into post-user 2020-11-17 23:31:41 +00: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 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
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 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
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 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 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
Michael ae363b74ad Check for empty body to prevent a fatal error 2020-11-12 16:52:55 +00: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 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
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
Michael e6030e5f82 API: Media attachments are now supported 2020-10-31 16:10: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 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 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
Michael 58383f38d7 Alternative item insert lock mechanism 2020-10-24 13:09:35 +00:00
Michael 592ac53ffc Worker priority / no shadow worker 2020-10-24 08:05:03 +00:00
Michael f405336680 Avoid duplicate item entries 2020-10-23 19:10:17 +00:00
Hypolite Petovan 4719af6724
Merge pull request #9440 from annando/one-click-follow 
Follow/Unfollow contact with a single click
 2020-10-20 11:09:56 -04:00
Michael 33575a94fa Follow/Unfollow contact with a single click 2020-10-20 03:49:58 +00:00
Philipp a74d88c4ee
Remove 'headers' option occurrences and add a warning if used. 2020-10-18 22:31:26 +02:00
Philipp a6fc9cd32e
Remove $binary flag for HTTPRequest::get(), HTTPRequest::fetch(), HTTPRequest::fetchAll() (deprecated since PHP 5.1.3) 2020-10-18 20:56:31 +02:00
Michael f3fd99da60 Don't change resharer when resharing 2020-10-11 17:37:04 +00:00
Michael 2d4a3f482b Use new function for validity check 2020-10-10 07:14:43 +00:00
Michael 4b9cbac23e Filter for account type for contacts 2020-10-09 19:08:50 +00:00
Michael 00974324fe Don't show failed contacts 2020-10-07 20:06:15 +00:00
Michael d785af23c1 Display number of group members in contact widget 2020-10-07 06:19:09 +00:00
Michael bda87e6536 Display language name / only search for available languages 2020-10-07 04:15:02 +00:00
Michael bb676f780c Changed documentation 2020-10-06 20:36:57 +00:00
Michael 5580b148a6 Added description 2020-10-06 19:51:51 +00:00
Michael 5998c3995e Issue-9358 (now for real) commenting and updating on contact now work 2020-10-06 18:47:23 +00:00
Hypolite Petovan 9954bf8adf
Merge pull request #9365 from annando/better-plaintext 
Improve plaintext generation for language detection
 2020-10-05 23:11:42 -04:00
Michael 77fcdede9b Fix tests 2020-10-05 18:11:05 +00:00
Michael 79af93405b Update the "commented" field only on several verbs 2020-10-05 17:57:24 +00:00
Michael 16224a7001 Improve plaintext generation for language detection 2020-10-05 12:50:18 +00:00
Michael b6b28b1541 Display the languages in the post 2020-10-04 18:52:28 +00:00
Hypolite Petovan 6fdab8394a Update wrong assertion regarding a profile being local user's self in Model\Profile 
- It was hiding follow links for profiles on the same node
 2020-10-03 23:03:33 -04:00
Hypolite Petovan 2bfd9851d3
Merge pull request #9314 from annando/suggestions 
New function for contact suggestions
 2020-10-03 13:32:21 -04:00
Hypolite Petovan d4968b4562
Merge pull request #9346 from annando/reduce-contact-update 
Reduce the amount of contact updates
 2020-10-03 12:43:28 -04:00
Michael 26e9efc746 Added brackets 2020-10-03 16:17:18 +00:00
Michael 2cd54320e4 New language detection 2020-10-03 15:42:21 +00:00
Michael d504789c34 Reduce the amount of contact updates 2020-10-03 10:52:34 +00:00
Michael d94e653030 Issue 9344: Update trending tags hourly 2020-10-03 06:10:39 +00:00
Michael 73a7df85f7 Issue 9303: Detect AP accesses as backend, prevent ping pong 2020-10-02 09:31:39 +00:00
Philipp 97f07b7518
Merge pull request #9334 from annando/endless-scroll 
Endless scrolling for searches and contact comments
 2020-10-01 23:04:56 +02:00
Michael Vogel eacc806c4b
Merge pull request #9327 from nupplaphil/task/security_restructure 
Restructure Security classes
 2020-10-01 19:49:51 +02:00
Michael 88a0e976da Endless scrolling for searches and contact comments 2020-09-30 19:14:13 +00:00
Michael 5dd426f526 Added option to stay on the local machine when clicking on a contact link 2020-09-30 17:30:26 +00:00
Philipp 8318a0b640
Move ExAuth, FKOAuth1 & FKOAuthDataStore to own namespace Friendica\Security 2020-09-30 11:14:01 +02:00
Tobias Diekershoff 0b37f1d56c
Merge pull request #9321 from annando/trending-public 
Trending tags: Ensure to only count public posts from the public contact
 2020-09-30 07:22:51 +02:00
Tobias Diekershoff 317196b6e2
Merge pull request #9324 from annando/endless-contact 
Endless scrolling on contact page
 2020-09-30 07:19:16 +02:00
Michael 887732b605 Endless scrolling on contact pages 2020-09-29 20:47:19 +00:00
Michael d0b36781a8 Trending tags: Ensure to only count public posts 2020-09-29 19:49:40 +00:00
Michael eff4d18209 Force removal from relay list 2020-09-29 05:06:37 +00:00
Michael fb50a43ac0 New function for contact suggestions 2020-09-28 21:33:40 +00:00
Michael 0b1a97ca9c Contact posts: Only display reshared posts when they are the causer 2020-09-28 15:20:08 +00:00
Hypolite Petovan 178e506917
Merge pull request #9304 from annando/suggestions 
Functionality to add suggestions
 2020-09-27 17:16:29 -04:00
Michael Vogel 4733683e91
Update src/Model/FContact.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2020-09-27 22:31:59 +02:00
Michael 61fee84c15 Functionality to add suggestions 2020-09-27 18:58:02 +00:00
Michael a7f6775f45 Avoid duplicate postings 2020-09-27 13:23:59 +00:00
Michael fd6e750e80 Tags: Use the parameters for the cache key 2020-09-27 08:11:43 +00:00
Michael 9c675c3f01 Fix the key fields in the self contacts 2020-09-26 20:59:28 +00:00
Michael 3b90dc0289 Use period and limit in the cache key 2020-09-26 12:16:46 +00:00
Michael f7cf8fe3d0 Issue 9276: Cache the trending hashtags in the background 2020-09-26 09:42:12 +00:00
Michael 9552473db5 Issue 9264: post types should now work 2020-09-25 06:47:07 +00:00
Michael d9d1268194 Issue 9264: Ensure that "pt_follower" is only set when its a real follower 2020-09-24 10:26:28 +00:00
Michael b0c9c9b7cb Relay settings are now valid for the ActivityRelay as well 2020-09-22 15:48:44 +00:00
Michael 93cd85595c Added foreign key 2020-09-22 07:19:44 +00:00
Michael d3abf5eff9 Set "follower" on relayed posts as well 2020-09-22 05:57:03 +00:00
Michael 338ddf45b1 We now store the causer-id in the items 2020-09-22 05:36:01 +00:00
Michael 11d2b027ec Additional direction for fetching content 2020-09-21 15:17:33 +00:00
Michael c082109ff9 Show if a post arrived via relay 2020-09-21 12:31:20 +00:00
Hypolite Petovan a852455d0e Merge remote-tracking branch 'friendica/stable' into develop 
# Conflicts:
#	composer.lock
 2020-09-20 15:32:58 -04:00
Michael bf2ca5fcf9 Issue 9229: Show unfollow with known contacts 2020-09-19 20:47:05 +00:00
Michael 86592daaa1 Include more field in the fulltext search 2020-09-19 10:45:11 +00:00
Michael dfeae25e6d Issue 9231: Speed up full text search 2020-09-19 08:26:50 +00:00
Michael 84a9a5b174 Fixes several notices 2020-09-19 03:16:26 +00:00
Michael 03157cc2f2 Issue 9165: Make pager work for search 2020-09-17 21:10:59 +00:00
Philipp cdb61be06f
Rewrite Process Model/Core 2020-09-15 18:16:44 +02:00
Michael 08fa5f0c19 We now set the "global" direction 2020-09-14 17:48:57 +00:00
Michael 73bcca892e Fixed capitalization 2020-09-13 21:00:54 +00:00
Michael 5a41cd437d Add additional direction types 2020-09-13 14:15:28 +00:00
Michael a491c5d916 Store and display to/cc/bcc 2020-09-12 17:45:04 +00:00
Hypolite Petovan 35b98ce97f
Use item uri-id in src/Model/Item.php 2020-09-12 11:43:02 -04:00
Hypolite Petovan 5041aab89e
Use DI logger in src/Model/Item.php 
Co-authored-by: Philipp <admin+Github@philipp.info>
 2020-09-11 08:06:30 -04:00
nobody d3cb72c33c see what namespace works 2020-09-11 02:37:18 -07:00
nobody 61685aeadd function name 2020-09-11 02:29:13 -07:00
nobody 0c026be2c1 allow forum delivery using attached mention tags (as well as mentions in the body) 2020-09-11 02:12:09 -07:00
Hypolite Petovan 6ad75f5b41 Remove over-specific location fields from vcard in favor of "location" 2020-09-09 01:21:56 -04:00
Hypolite Petovan b530ef709d
Merge pull request #9147 from annando/Issue-8882 
Issue 8882: Fixes permissions of pinned posts
 2020-09-07 03:14:25 -04:00
Michael 2a0635185a Fix notifications for wrong users 2020-09-07 04:36:28 +00:00
Michael 4852458645 Simplify the code / check number of parameters in mergeConditions 2020-09-06 20:28:08 +00:00
Michael 0684922ec2 Use array_unique 2020-09-06 20:09:29 +00:00
Michael d332272d55 Issue 9099: Improve mentions from non followers 2020-09-06 19:22:53 +00:00
Michael 8d0d6bcd0c Issue 8882: Fixes permissions of pinned posts 2020-09-06 15:05:42 +00:00
Michael a0cb6b409d Avoid "Duplicate entry" error in apcontact 2020-09-06 09:39:47 +00:00
Michael cd3d4ae4e6 API: New entity "status" 2020-09-03 18:57:18 +00:00
Michael 6acf660ebd New model class "host" 2020-09-02 19:19:00 +00:00
Michael 04b6f00ca9 Simplifications 2020-09-02 07:14:01 +00:00
Michael a2e4a0170b Changed field origin 2020-09-02 03:13:10 +00:00
Michael cbf1e5c699 New field "manually-approve" for contact table 2020-09-02 03:02:50 +00:00
Michael 23b7da3664 Removed unused PoCo functionality 2020-08-31 12:40:23 +00:00
Michael 1d8e1284ef Another "Duplicate entry" error avoided 2020-08-28 05:47:41 +00:00
Michael 44ee4a54b4 Replace "insert" with "replace" 2020-08-27 21:35:08 +00:00
Michael c403efb177 Improved logging 2020-08-23 17:58:22 +00:00
Michael 6139f5883b Mark posts that arrived in your network stream via tag 2020-08-23 17:48:44 +00:00
Michael 7815862498 Improve AP support for forums 2020-08-23 11:26:43 +00:00
Hypolite Petovan b052896c64
Merge pull request #9057 from annando/issue-9051 
Issue 9051: Only change the owner of posts reshared by forums
 2020-08-23 06:44:41 -04:00
Hypolite Petovan b52070aa2f
Merge pull request #9056 from annando/ap-follow 
ActivityPub accounts don't need a "poll" endpoint
 2020-08-23 06:43:00 -04:00
Michael 6f1cd718fc Issue 9051: Only change the owner of posts reshared by forums 2020-08-23 08:39:56 +00:00
Michael 9cf6a8e945 ActivityPub accounts don't need a "poll" endpoint 2020-08-23 07:37:14 +00:00
Michael b61eacdadb Return system account data when fetching data for user "0" 2020-08-23 07:29:56 +00:00
Michael Vogel fc2340d4af
Merge pull request #8909 from MrPetovan/task/ex_auth 
Refactor ExAuth for DICE
 2020-08-22 22:12:22 +02:00
Hypolite Petovan d31010ca0e
Merge pull request #9050 from annando/system-account 
We now fetch data with an automatically generated system user
 2020-08-22 15:54:16 -04:00
Michael 6fd0848cde Ensure that the actor name can't be changed 2020-08-22 19:40:31 +00:00
Michael b12a2c486e Use "getActorName" 2020-08-22 18:52:37 +00:00
Hypolite Petovan 2e5b4dedb8
Merge pull request #9052 from annando/fix-change-owner 
Fix: Don't change the owner of your own posts
 2020-08-22 14:17:45 -04:00
Hypolite Petovan 507d66936c
Merge pull request #9049 from annando/local-followers 
Improved function description
 2020-08-22 14:08:48 -04:00
Hypolite Petovan 9923e17aed
Merge pull request #9044 from annando/avatar-stuff 
Some stuff with contact avatars
 2020-08-22 14:08:20 -04:00
Michael 3cf3a97e8d Fix: Don't change the owner of your own posts 2020-08-22 17:30:14 +00:00
Michael 7dbf72e454 We now fetch data with an automatically generated system user 2020-08-22 14:48:09 +00:00
Michael 50ecb58716 Improved function description 2020-08-22 14:36:42 +00:00
Tobias Diekershoff 2475058cc4
Merge pull request #9048 from annando/fix-tag-scheme 
Fix malformatted tag scheme
 2020-08-22 13:21:54 +02:00
Michael 22027f8451 Fix malformatted tag scheme 2020-08-22 05:59:19 +00:00
Michael 3c85f3ce99 Fetch followers/followings locally 2020-08-21 21:27:40 +00:00
Michael e9d6fb9aaa Store the cached avatars at the public contact 2020-08-21 18:41:48 +00:00
Michael 707af437e2 Fix sharing detection on reshares 2020-08-20 02:49:02 +00:00
Michael b82f22aa0e Fix missing field 2020-08-19 08:20:31 +00:00
Michael 3d1829ede5 Don't poll locally / user self data 2020-08-19 05:18:19 +00:00
Michael eb95314aaa Avoid locally probing last item via network 2020-08-19 04:45:31 +00:00
Michael 29494ea721 Avoid local network requests 2020-08-19 04:11:20 +00:00
Michael ce2af84cba Use a constant for the contact photos / dom't cache them 2020-08-18 22:18:48 +00:00
Michael d9fc0ae0ea Using a constant value for the default avatar 2020-08-18 20:30:24 +00:00
Michael 5aba1df497 Use "User::getIdForURL" 2020-08-18 19:45:01 +00:00
Michael 998c83eacb Avoid loop situations and connection timeouts 2020-08-18 03:55:27 +00:00
Hypolite Petovan a7f8604d42
Merge pull request #9019 from annando/performance 
Some performance tweaks
 2020-08-16 10:07:35 -04:00
Michael Vogel 87ac50e253 Use the uid for the owner cache 2020-08-16 14:51:15 +02:00
Michael Vogel 45c12e7716 Some performance tweeks 2020-08-16 13:57:56 +02:00
Michael b136c5f32b Split the CXronjobs class into separate classes 2020-08-16 08:39:04 +00:00
Michael 1f9b365f3b Issue 9015: Reducing load of remote systems 2020-08-15 20:05:08 +00:00
Michael 1ab81266b9 Change the owner of a reshared item 2020-08-13 06:09:26 +00:00
Michael 0e2dbd8fa3 Merge branch 'notify-shared' of github.com:annando/friendica into notify-shared 2020-08-13 05:17:43 +00:00
Michael 59311e9c49 Changed comment 2020-08-13 05:17:37 +00:00
Michael Vogel d331a88adc
Update src/Model/UserItem.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2020-08-12 18:19:02 +02:00
Michael Vogel 8d8b6b1bf5
Update src/Model/UserItem.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2020-08-12 18:18:45 +02:00
Michael 7cdbcf411f Clarify the functionality 2020-08-12 13:54:19 +00:00
Michael 8488ed76e4 Don't create notifications for activities 2020-08-12 08:37:38 +00:00
Michael 26df7595ac removed unneeded notification check 2020-08-12 04:43:46 +00:00
Michael 4ee858740e Create notifications for shared posts 2020-08-12 04:35:24 +00:00
Michael 45be80b05e Display reshared ("announced") messages of a user on their page 2020-08-11 16:40:01 +00:00
Michael 946063e6e7 Perform notification check 2020-08-11 08:30:15 +00:00
Michael 5698edddba Added source code comments 2020-08-11 05:23:16 +00:00
Michael 40dce6085d Add notification check 2020-08-10 21:02:59 +00:00
Michael ef7aed5d1f Partly revert coding for compatibility issues 2020-08-10 13:59:51 +00:00
Michael 62ce87dfe6 Fixing processing forum posts 2020-08-09 22:46:18 +00:00
Michael bf7128b4b2 AP Improvements for forums 2020-08-09 18:42:25 +00:00
Michael Vogel f0a0c6b822
Merge pull request #8982 from MrPetovan/task/8918-move-mod-common 
Move mod/common.php to src/ Part 3: Add Module\Contact\Contacts class
 2020-08-07 20:51:02 +02:00
Michael 7b13b7e9c8 Reworked "getIdForURL" 2020-08-07 13:49:59 +00:00
Hypolite Petovan e64dcc5b5b Remove obsolete modules common and allfriends 
- Delete obsolete Model\GContact class
 2020-08-06 22:59:10 -04:00
Hypolite Petovan b45ba63dbf Add mutuals and all methods in Contact\Relation 
- Remove unused $fields parameters from list methods
- Fix wrong SQL condition in listCommon
 2020-08-06 22:59:09 -04:00
Michael f09d9bc9cc Remove url caching, locking cleanup 2020-08-06 18:53:45 +00:00
Hypolite Petovan c0aebd2bd4
Merge pull request #8978 from annando/contact-update 
Avoid double probing and unneeded contact updates
 2020-08-06 09:04:39 -04:00
Hypolite Petovan 454836243d
Merge pull request #8980 from annando/fcontact-model 
New "fcontact" model class
 2020-08-06 09:01:47 -04:00
Michael 2cbc935944 Renamed function 2020-08-06 10:31:05 +00:00
Michael d4f7bfa676 New "fcontact" model class 2020-08-06 10:27:06 +00:00
Michael ecfbc7027e Unused "use" removed 2020-08-06 05:52:22 +00:00
Michael e295dc4f93 Avoid double probing and unneeded contact updates 2020-08-06 04:51:20 +00:00
Michael Vogel 1fb47b96aa
Merge pull request #8975 from MrPetovan/task/8918-move-mod-common 
Move mod/common.php to src/ Part 2: Add Module\Profile\Common class
 2020-08-05 23:17:12 +02:00
Michael 4acf7cc38f Fix: Always search contacts with uid 2020-08-05 14:57:49 +00:00
Hypolite Petovan 307af4a4fd
Merge pull request #8973 from annando/contact-group 
New class for group related contact actions
 2020-08-05 10:30:45 -04:00
Michael 4e5a3ab0f1 Added checked for URL change 2020-08-05 12:53:02 +00:00
Michael 187dbc09ac Avoid double probing 2020-08-05 12:36:04 +00:00
Michael 2280f52945 Only query the last item on public contacts 2020-08-05 08:24:01 +00:00
Michael 3a4be3d5f4 Fill "last-item" with an empty date when bo date had been provided 2020-08-05 08:06:47 +00:00
Michael fd62629285 Probe for the date of the last item 2020-08-05 06:50:51 +00:00
Michael 018abb4d1d Renamed function 2020-08-05 03:36:37 +00:00
Hypolite Petovan ae23c69303 Remove extraneous $field parameter in Contact\Relation methods 2020-08-04 22:44:23 -04:00
Michael 1d44e544cf New class for group related contact actions 2020-08-04 18:22:19 +00:00
Michael a7d75702cc "Contact\User" class created 2020-08-04 04:47:02 +00:00
Michael 53810a9e42 Added field value 2020-08-03 19:40:31 +00:00
Michael 4e90029234 Adding $fields 2020-08-03 19:38:03 +00:00
Michael 14bb6daa5d "Allfriends" now work again 2020-08-03 19:21:31 +00:00
Michael a36d305984 Removed now unused functions 2020-08-03 18:34:55 +00:00
Michael ee1cb93f3a Use the new relation functions 2020-08-03 18:21:56 +00:00
Michael 879c30d4fa Merge remote-tracking branch 'upstream/develop' into contact-tabs 2020-08-03 18:00:51 +00:00
Hypolite Petovan a74c547af4 Move ContactRelation class to Contact\Relation 
- Update references in GContact
 2020-08-03 13:38:26 -04:00
Hypolite Petovan 24a82110fd Add common relationship methods to Model\ContactRelation 
- Introduce DBA::mergeConditions method
- Replace GContact relationship method contents with Model\ContactRelation method calls
 2020-08-03 13:34:10 -04:00
Michael 748ddb7ad2 Merge remote-tracking branch 'upstream/develop' into contact-tabs 2020-08-03 16:06:07 +00:00
Michael 88d406004c Removed now ununsed functions 2020-08-02 18:15:03 +00:00
Michael ff7b72cca3 Renamed function 2020-08-02 13:37:43 +00:00
Michael 91c360638a Ensure contact tabs will use the correct id 2020-08-02 13:34:49 +00:00
Michael bb1517a74c Random profiles now moved away from "gcontact" as well 2020-08-02 08:07:31 +00:00
Michael 0c73531da1 Poco and gcontact (mostly) removed 2020-08-01 16:15:18 +00:00
Michael a9a9f7d51d Update the last query at a single place 2020-08-01 08:56:07 +00:00
Michael bb70258d48 Discovery of peers of other servers 2020-08-01 05:55:27 +00:00
Hypolite Petovan 869329c972
Merge pull request #8948 from annando/remove-gcontact 
Replace "gcontact" with "contact" - improved suggestions
 2020-07-30 21:25:22 -04:00
Michael dcf6926a08 Some indentation 2020-07-30 21:23:54 +00:00
Hypolite Petovan 7aa43dc2f4
Merge pull request #8944 from annando/signed-requests 
AP: Always sign HTTP requests
 2020-07-30 17:09:22 -04:00
Michael Vogel 43b4841fa6
Update src/Model/Contact.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2020-07-30 22:39:09 +02:00
Michael Vogel 113e8d910b
Update src/Model/Contact.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2020-07-30 22:39:01 +02:00
Michael cc85bc4156 Replace "gcontact" with "contact" - imroved suggestions 2020-07-30 14:08:32 +00:00
Michael 7441bd90c8 Possibly fix a fatal error 2020-07-29 19:48:26 +00:00
Michael 4fbec33af0 Asynchronous contact relation check 2020-07-29 15:39:45 +00:00
Michael a3ba0ccc93 Simplified code 2020-07-29 14:59:55 +00:00
Michael 2a243b747d Improved functionality to fetch the admin user 2020-07-29 14:55:55 +00:00
Michael e06d9f20cf AP: Always sign requests 2020-07-29 05:12:16 +00:00
Hypolite Petovan 418c2edb50
Merge pull request #8938 from annando/get-avatar 
Fetch photo fields, ensuring that they are filled
 2020-07-28 11:41:48 -04:00
Michael b79bb0d2cb Fetch photo fields, ensuring that they are filled 2020-07-28 12:58:19 +00:00
Michael d72d59bf9e Logging and check for network added 2020-07-28 06:42:12 +00:00
Michael e6cd5a4d66 Merge remote-tracking branch 'upstream/develop' into personal-copy 2020-07-28 05:40:37 +00:00
Hypolite Petovan aed879a086
Merge pull request #8936 from annando/ap-probing 
Selective probing for AP
 2020-07-27 16:24:11 -04:00
Michael 3cc026b8a8 Adding OStatus as well 2020-07-27 19:45:35 +00:00
Michael 477e9bd67a Selective probing for AP 2020-07-27 19:36:11 +00:00
Hypolite Petovan 1314d9803c
Merge pull request #8933 from annando/Ensure-that-cached-avatar-fields-are-set 
Ensure that cached avatar fields are set
 2020-07-27 08:11:09 -04:00
Michael 5b884e8348 Changed function name 2020-07-27 10:22:02 +00:00
Michael 6ab82eaa49 Ensure that cached avatar fields are set 2020-07-27 10:11:12 +00:00
Michael Vogel ab04227ce3
Update src/Model/ContactRelation.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2020-07-26 23:39:47 +02:00
Michael Vogel d2a4a57810
Update src/Model/ContactRelation.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2020-07-26 23:39:30 +02:00
Michael 18617f6c48 Fetch followers/followings of contacts 2020-07-26 07:34:33 +00:00
Michael 9b86f40a5f Store avatar cache fields only when needed 2020-07-25 11:48:52 +00:00
Michael Vogel 398e65d66b
Merge pull request #8911 from MrPetovan/task/curl_DI 
Introduce "HTTPRequest" class
 2020-07-25 09:50:20 +02:00
Michael 0007da8630 EOL removed 2020-07-23 06:25:01 +00:00
Michael 3fc3ded750 Useless info messages removed 2020-07-23 06:11:21 +00:00
Michael ca9f8e7420 New function "Item::storeForUserByUriId" 2020-07-23 03:26:54 +00:00
Michael abdcf7ca88 Fix "!=" 2020-07-22 05:34:56 +00:00
Michael da349a1814 Store copy on activities 2020-07-22 05:16:57 +00:00
Hypolite Petovan ec3ec3b78a Replace remaining occurrences of Network::curl 2020-07-21 21:39:59 -04:00
Michael d0ef6f2b08 Store personal copy of public item upon commenting 2020-07-21 23:26:01 +00:00
Michael 990c70807d Fix notice "Undefined index: parent-uri" 2020-07-21 19:43:07 +00:00
Michael 1d9ef1a3d8 Corrected variable in condition 2020-07-21 18:53:01 +00:00
Michael e2826a98d3 Added logging 2020-07-21 18:30:45 +00:00
Michael ab8eef24c5 Posts with subscribed tags will now be stored for the user 2020-07-21 08:35:57 +00:00
nupplaPhil 1998b7811b Fix fatal execution path for found Network::get() parameter execption 2020-07-21 03:19:05 -04:00
nupplaPhil 657d08f09f Rename "fetchUrl" and "fetchUrlFull" to "fetch" and "fetchFull" 2020-07-21 03:15:53 -04:00
nupplaPhil 7029012f27 Rename "HTTPRequest::curl()" to HTTPRequest::get() 2020-07-21 03:14:01 -04:00
nupplaPhil 1aa07f87a4 Make "HTTPRequest::fetchUrl" dynamic 2020-07-21 03:04:58 -04:00
nupplaPhil 2973ed6448 Make "HTTPRequest::curl" dynamic 2020-07-21 03:01:12 -04:00
nupplaPhil 5344efef71 Move post/curl/fetchUrl/fetchUrlFull to own class "Network\HTTPRequest" 2020-07-21 02:56:10 -04:00
Philipp Holzer 8565617ea1 Refactor ExAuth for DICE 2020-07-21 02:30:12 -04:00
Hypolite Petovan ee02be3d48 Improve exception documentation in Model\User 2020-07-21 02:30:11 -04:00
Michael 39ffb3e745 Remove debug output 2020-07-20 08:02:34 +00:00
Hypolite Petovan 31d2a74b0b
Merge pull request #8901 from annando/failed 
New field in gserver, gcontact and contact for failed connections
 2020-07-19 12:21:54 -04:00
Michael 5bf813d0ec Use "failed" field 2020-07-19 11:42:23 +00:00
Michael 59bebe7bcf Post update added 2020-07-19 10:03:33 +00:00
Michael Vogel 35db33bcd2 Ensure to only store valid item fields 2020-07-19 03:40:40 +02:00
Michael b50f91b3e1 Merge remote-tracking branch 'upstream/develop' into failed 2020-07-19 01:18:35 +00:00
Michael 1532f0d529 New field "failed" for gserver, gcontact and contact 2020-07-19 01:15:57 +00:00
Michael Vogel 9f1d1db1ee Database performance updates 2020-07-18 17:49:10 +02:00
Michael d6bf7f2cda Replace "Probe::uri" with "Contact::getByURL" 2020-07-16 10:22:14 +00:00
Michael caf548e1a7 Fix fetching contacts 2020-07-16 03:52:18 +00:00
Michael b0086a49e2 in "getidforurl" "no update" is now "update" 2020-07-15 21:08:42 +00:00
Michael 6d3949d54a Changed default value 2020-07-15 17:29:52 +00:00
Michael e374aecc46 Changed parameter order for "getbyURLForUser" 2020-07-15 17:22:12 +00:00
Michael fc0312451d Changed parameter order for getByURL 2020-07-15 17:06:48 +00:00
Michael d9c6a46ffe Replaced "getDetailsByURL" with "getByURL/getByURLForUser" 2020-07-15 04:42:04 +00:00
Michael 27deb4d188 Module classes splitted 2020-07-13 09:45:45 +00:00
Michael 2a1e6e1a74 Support Nodeinfo2 2020-07-12 21:53:17 +00:00
Hypolite Petovan 32a8f5003f Add provision for result containing only connector profiles in Contact::getDetailsByURL 2020-07-11 09:18:18 -04:00
Michael 84d8753d5f Remove the locking to improve performance 2020-07-10 19:50:16 +00:00
Michael Vogel af6f6d4957 Fix speed issues with the network page 2020-07-10 00:22:26 +02:00
Hypolite Petovan 2db04b0c34 Add check for parent item existence in Model\UserItem::setNotificationForUser 2020-07-09 15:09:07 -04:00
Michael 77e272e8ed Issue 8836: Point the event to the local post 2020-07-08 20:42:28 +00:00
Hypolite Petovan 6cde7afa53 Exclude deleted user accounts from "active" user list in Model\User 2020-07-06 15:26:39 -04:00
Hypolite Petovan b9873a88a5
Merge pull request #8832 from annando/fix-db-error 
Fix database error ""Unknown column 'parent-item.author-id'"
 2020-06-30 14:55:52 -04:00
Michael 6aadb6b923 Changed structure 2020-06-30 17:51:03 +00:00
Michael 8f1635d8fd Fix database error ""Unknown column 'parent-item.author-id'" 2020-06-30 05:49:22 +00:00
Michael 9a47e51115 Next logger calls replaced 2020-06-28 18:22:29 +00:00
Michael 52bb1ff0f1 Some more replaced logger 2020-06-28 17:35:56 +00:00
Michael Vogel c852e1479c
Merge pull request #8811 from MrPetovan/task/8517-probe-mobile-twitter 
Add support for mobile profile URL to core twitter probing
 2020-06-27 17:32:19 +02:00
Hypolite Petovan 0b38826a73 Simplify sender handle assignment in Model\Mail 2020-06-27 09:34:29 -04:00
Michael de19f94aca Prevent delivering AP comments to Diaspora 2020-06-27 12:18:36 +00:00
Hypolite Petovan 50d05cec83 Ensure url property of Probe::uri result is used authoritatively 
- Some profile URLs aren't canonical and need to be updated during probe
 2020-06-26 12:52:39 -04:00
Michael 019a9d44c5 New function to fetch contact data by url 2020-06-26 05:28:25 +00:00
Hypolite Petovan 192576f01a Add logging to rare condition in Model\Profile::sidebar 
- Adresses https://github.com/friendica/friendica/issues/8475#issuecomment-647104375
 2020-06-24 09:56:11 -04:00
Hypolite Petovan aafef02789 Replace obsolete anonymity test with a slightly less obsolete one in Model\Item 
- Address part of https://github.com/friendica/friendica/issues/8475#issuecomment-646457104
 2020-06-19 07:10:27 -04:00
Michael 8707ced2f7 Hopefully fixes notice "Undefined index: gravity" 2020-06-16 20:30:25 +00:00
Michael e1dac1a87a Categories are not showing up at the bottom of the post 
Fixes friendica/friendica#8766
 2020-06-15 03:43:51 +00:00
Michael 8ec2b21a14 Abuse mail received because of "unusual traffic" 
Fixes friendica/friendica#8663
 2020-06-14 15:47:47 +00:00
Michael Vogel aedbb0d627
Merge pull request #8753 from MrPetovan/bug/fatal-errors 
Remove dependency to App in Contact::createFromProbe
 2020-06-12 06:58:20 +02:00
Hypolite Petovan a5a7855d39 Remove dependency to App in Contact::createFromProbe 
- Address https://github.com/friendica/friendica/issues/8473#issuecomment-641259906
 2020-06-10 10:36:42 -04:00
Hypolite Petovan be41095936 Add probe data return if Contact::getDetailsByURL didn't yield a result in Contact::getDetailsByAddr 2020-06-10 09:56:01 -04:00
Hypolite Petovan 5f18d27b0b
Merge pull request #8752 from annando/posts-from-id 
Avoid unneeded database calls when showing posts of contacts
 2020-06-10 00:11:51 -04:00
Michael 0e9331a1ff Avoid unneeded database calls when showing posts of contacts 2020-06-09 22:38:06 +00:00
Hypolite Petovan 89b3ae2657 Add null/empty string parameter value case in BBCode::convert 
- Remove obsolete coalesce operator uses
 2020-06-08 19:15:08 -04:00
Hypolite Petovan 76460ddd2d Add tag escaping to Item::setHashtags 
- Add return value to Item::setHashtags
 2020-06-08 18:40:21 -04:00
Michael bc4e5b4d69 Issue 8735: Ensure the correct data type for "hide" 2020-06-06 08:11:19 +00:00
Michael 7374104f29 Fix Notice "Undefined index: subscribe" 2020-06-05 10:44:36 +00:00
Michael 7b70eefbb6 Remove the "addr" when webfinger fails 2020-06-04 22:08:31 +00:00
Michael 62217735f0 Use webfinger in apcontact fetch 2020-06-04 21:55:14 +00:00
Michael e379698227 Issue 8675: reduce requests of foreign pages 2020-06-01 21:52:31 +00:00
Michael 7ac4a08e1b Additional "is null" check in post update / create the "vid" if needed 2020-05-31 15:48:31 +00:00
Michael 9328eee550 Missing gravity 2020-05-29 22:19:59 +00:00
Michael Vogel 235f4eaa89
Merge pull request #8697 from MrPetovan/task/8691-like-links-one-way 
Make like links one way
 2020-05-29 15:33:24 +02:00
Hypolite Petovan f0b6f025d2 Appease VSCode inferior static analysis in Model\Item 2020-05-29 09:01:37 -04:00
Hypolite Petovan 0efd3dedeb
Merge pull request #8705 from annando/thread-uri-id 
Add "uri-id" to the "thread" table
 2020-05-28 23:59:44 -04:00
Michael Vogel c6aa42dd4e
Merge pull request #8696 from MrPetovan/bug/8694-event-network-unkn 
Assign default protocol to new events
 2020-05-29 05:05:35 +02:00
Michael 3258216e8d Add "uri-id" to the "thread" table 2020-05-28 21:44:55 +00:00
Hypolite Petovan df1c74bd33 Make "like" links one way 
- Updated dolike() function to accept a "un-" switch
- [frio] Updated doLikeAction() function to call dolike() instead of having duplicated code
- Added boolean logic (with explanatory truth table) to smartly delete existing activities in Model\Item::performActivity
- Moved verb/activity parameter handling closer to their use in Model\Item::performActivity
- Updated all references to dolike() and doLikeAction() to include the "un-" switch
 2020-05-27 08:41:13 -04:00
Hypolite Petovan 05c3d02854 Assign default protocol to new events 
- This restores event interactions on the items
 2020-05-27 08:23:15 -04:00
Michael 973abb6196 Replace "id = parent" checks with "gravity" checks 2020-05-27 12:19:06 +00:00
Michael 465e1890b5 Fix notice because of missing array item 2020-05-27 03:19:17 +00:00
Michael ba9cf32f36 The "item-activity" is removed 2020-05-26 05:18:50 +00:00
Michael 327cdf21ce Some more "baseurl" improvements 2020-05-24 20:40:00 +00:00
Hypolite Petovan 669124e72f
Merge pull request #8678 from annando/gserver-detection-type 
Improved server detection / gsid introduced
 2020-05-22 10:25:37 -04:00
Michael 21ab11ac18 Only fetch the gsid when it had been empty before 2020-05-22 11:29:58 +00:00
Michael e27915a819 Centralized gsid generation 2020-05-22 10:10:24 +00:00
Michael 071505f024 Added documentation, simplified code 2020-05-22 04:52:43 +00:00
Michael 95b4f35a12 Improved server detection / gsid introduced 2020-05-22 04:19:32 +00:00
Hypolite Petovan 6fd13300cb Fix wrong variable name in Model\Attach 
- Prevented attachment data from being retrieved from storage
 2020-05-20 18:28:14 -04:00
Michael a77c0194dc Issue 8663: Prevent abusive behaviour when probing servers 2020-05-20 06:57:46 +00:00
Michael Vogel b7b6fae389
Update src/Model/Verb.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2020-05-19 22:42:01 +02:00
Michael eeda115e32 Adding some more verb handling 2020-05-19 20:32:15 +00:00
Hypolite Petovan 3cc3bfe531
Merge pull request #8660 from annando/item-insert 
Improved item insert functionality
 2020-05-18 19:35:26 -04:00
Michael e09965fcc5 Simplified code 2020-05-18 22:34:47 +00:00
Michael 2f8c6f00b5 Improved item insert functionality 2020-05-18 21:34:57 +00:00
Hypolite Petovan 75a0b80888 Add new Strings::startsWith method 
- Move previous method to Strings::startsWithChars and update every known call
 2020-05-18 01:05:38 -04:00
Michael bc26c980f0 Reverts test changes 2020-05-17 13:59:05 +00:00
Michael d771c50d63 Issue 8565: Sanitize input data 
Fixes #8565
 2020-05-17 06:13:58 +00:00
Michael 76d845a138 Found another occurence replaced with constants 2020-05-16 16:39:44 +00:00
Michael 0cf517ad76 Use constants for the BBCode modes 2020-05-16 16:28:15 +00:00
Michael 7a82171bfe The "term" table is removed 2020-05-15 06:50:20 +00:00
Michael Vogel cc8491223e
Merge pull request #8631 from MrPetovan/task/remove-item-tag-field 
Remove references to obsolete virtual tag item.tag
 2020-05-14 06:29:46 +02:00
Michael 3dc231ffd6 Code standards 2020-05-14 03:48:26 +00:00
Hypolite Petovan c2a76db290 Add type filter parameter to Tag::getCSVByURIId 2020-05-13 22:35:39 -04:00
Michael 04005f2878 Added documentation 2020-05-13 19:26:59 +00:00
Michael 7ea40ea796 Rearranged calls 2020-05-13 18:45:31 +00:00
Michael 13bd43f3f6 Store the diaspora signature differently 2020-05-13 05:48:26 +00:00
Michael c4062ddb3b Removed "insert" parameter 2020-05-12 21:49:12 +00:00
Michael 06da3084f5 Restructured item insert 2020-05-12 20:13:48 +00:00
Hypolite Petovan d35dc64660
Merge pull request #8611 from annando/issue-8610 
Issue 8610: Implicit mentions work again
 2020-05-09 16:03:45 -04:00
Hypolite Petovan 1e53f28b18
Merge pull request #8615 from annando/verb 
We now store verbs in a new side table
 2020-05-09 16:03:15 -04:00
Michael 258e9df064 Moved the check for a comment to a different place 2020-05-09 15:50:49 +00:00
Michael 19b5b83ac6 Forgotten "close" 2020-05-09 15:43:41 +00:00
Michael 5fe6a2dfcd We now store verbs in a new side table 2020-05-09 15:38:40 +00:00
Hypolite Petovan 184fa9f980 Skip user removal if it's already been removed in Console\User 2020-05-09 11:05:20 -04:00
Michael a1fda8f74a Dant try to add mentions on starting posts 2020-05-09 08:39:21 +00:00
Michael 556cc3fb13 Always mention the parent author 2020-05-09 08:08:33 +00:00
Michael d5f64e1156 Issue 8610: Implicit mentions work again 2020-05-09 06:33:59 +00:00
Michael 856cf7f664 Don't count and fetch "follow" activities 2020-05-07 18:39:39 +00:00
Michael 065fad31f1 ignore "follow" activities that are not from the user 2020-05-06 21:19:48 +00:00
Michael be9519708e Don't relay participation messages 2020-05-06 20:43:00 +00:00
Michael d33f6fc167 Renamed function 2020-05-05 21:58:25 +00:00
Michael 980de37047 Removed legacy usage of the "tag" field 2020-05-05 19:54:25 +00:00
Michael 3d4ace7a9d Merge branch 'no-term3' into no-term2 2020-05-05 16:09:50 +00:00
Michael 59675c4f0b Merge remote-tracking branch 'upstream/develop' into no-term2 2020-05-05 15:44:24 +00:00
Michael b7e25d16e7 Removed usage of "tag" field 2020-05-05 05:11:59 +00:00
Michael 16d486dd24 Merge remote-tracking branch 'upstream/develop' into post-delivery-data 2020-05-04 14:40:52 +00:00
Michael 4fa26c81e8 Fix for wrong table and wrong field name 2020-05-03 15:44:39 +00:00
Michael 875d6b36e9 File and category aren't using "term" anymore 2020-05-03 15:13:40 +00:00
Michael c141a3eb79 Corrected variable name 2020-05-02 22:02:29 +00:00
Michael 098ba4a667 "item-delivery-data" is now "post-delivery-data" 2020-05-02 19:34:02 +00:00
Michael b0cb6536dd The old tag handling is removed 2020-05-02 05:08:05 +00:00
Michael 776a1dd7c3 Renamed function 2020-05-01 15:43:50 +00:00
Michael 729c6b67aa the "term" field now is called "name", workaround removed 2020-05-01 15:18:48 +00:00
Michael 74081a71ff Removed unused "use" 2020-05-01 13:26:13 +00:00
Michael ede69a8673 Function renamed 2020-05-01 13:13:58 +00:00
Michael 2b1fef469a Notification moved to usage of the "tag" table 2020-05-01 12:41:17 +00:00
Michael 029a379060 Move "isType" to Tag.php 2020-05-01 12:39:41 +00:00
Michael ac2957c4dd Some more "term" to "tag" conversion 2020-05-01 10:57:32 +00:00
Michael 3b2ae5c4a9 function names changed 2020-05-01 06:01:22 +00:00
Michael 136c6b644e Fix: Mentions had been stored as tags 2020-04-29 10:49:13 +00:00
Michael 8c44f535b7 Merge remote-tracking branch 'upstream/develop' into write-tags 2020-04-29 02:38:33 +00:00
Michael 00ef29fb97 It has to be "selectFirst" 2020-04-29 01:40:59 +00:00
Michael 1f9f321d54 Issue 8557: We have to fetch only a single row 2020-04-28 21:13:37 +00:00
Michael 10ffd3a374 Iissue 8560: Wrong value for parent in mail notification 2020-04-28 20:32:39 +00:00
Michael 70e5639e29 Merge 2020-04-28 13:33:03 +00:00
Michael c2a9b3b9e9 Usage of the new tag tables 2020-04-28 11:52:51 +00:00
Michael 5367620467 Merge remote-tracking branch 'upstream/develop' into write-tags 2020-04-28 08:03:26 +00:00
Michael e52e505a48 Merge 2020-04-28 08:00:38 +00:00
Michael f75009c20c Some more forgotten DBA::close 2020-04-28 07:10:18 +00:00
Michael 9ccdbd9349 Added forgotten DBA::close 2020-04-28 05:55:17 +00:00
Michael f521689ced Suppress XML logging of errors 2020-04-27 14:35:50 +00:00
Michael 7f5f68a904 More preparations for term to tag transition 2020-04-26 16:15:39 +00:00
Michael 5df5e9521b The tag table is now really used 2020-04-26 15:24:58 +00:00
Michael d74067b461 Queries had been simplified 2020-04-26 06:58:30 +00:00
Michael Vogel 7e8bcc9034
Update src/Model/Profile.php 
Co-Authored-By: Hypolite Petovan <hypolite@mrpetovan.com>
 2020-04-26 08:04:34 +02:00
Michael Vogel 3107680e51
Update src/Model/Profile.php 
Co-Authored-By: Hypolite Petovan <hypolite@mrpetovan.com>
 2020-04-26 08:04:17 +02:00
Michael Vogel 3f9c78a20b
Update src/Model/Profile.php 
Co-Authored-By: Hypolite Petovan <hypolite@mrpetovan.com>
 2020-04-26 08:04:03 +02:00
Michael Vogel 37b9031a27
Update src/Model/Profile.php 
Co-Authored-By: Hypolite Petovan <hypolite@mrpetovan.com>
 2020-04-25 23:33:11 +02:00
Michael Vogel 7f17c1484a
Update src/Model/Profile.php 
Co-Authored-By: Hypolite Petovan <hypolite@mrpetovan.com>
 2020-04-25 23:33:01 +02:00
Michael e012730e52 Added check and repair for missing self contact 2020-04-25 07:29:38 +00:00
Michael ee3a724b41 Three more joins replaced with views 2020-04-24 20:39:14 +00:00
Michael 57009d30c4 There is now a pending view 2020-04-24 15:42:43 +00:00
Michael cf0d36737f Removed query for "updated" in gcontact 2020-04-24 15:18:34 +00:00
Michael c4f7f3e26e And some more view calls added 2020-04-24 12:59:19 +00:00
Michael 02aed490e2 Owner-view added 2020-04-24 11:04:50 +00:00
Hypolite Petovan 43b8bdea07
Merge pull request #8520 from annando/term2tag 
We now store tags in "tag"
 2020-04-22 22:56:07 -04:00
Michael 1f7993acad Code standards 2020-04-22 15:22:39 +00:00
Michael Vogel ee098277b9
Merge pull request #8530 from MrPetovan/task/8498-move-poke-to-src 
Move poke module to src/
 2020-04-21 05:56:59 +02:00
Hypolite Petovan 7f04aea8b1 Move poke module to src/ 
- Add new route contact/<cid>/poke and update all references
- Rework template with form field includes
- [frio] Enable modal behavior
 2020-04-20 11:47:08 -04:00
Michael 27ea747e99 Switchable contact probing 2020-04-20 09:47:26 +00:00
Michael 21103a5735 Store implicit mentions 2020-04-20 05:43:13 +00:00
Michael f4543b2cf7 Fix: Wrong variable 2020-04-20 05:42:46 +00:00
Michael 2bb76d96d6 Improved logging 2020-04-19 16:48:03 +00:00
Michael 538e212a84 Hashtag handling with Diaspora improved 2020-04-19 16:33:06 +00:00
Michael 98b3058601 Update item-uri with guid if given 2020-04-19 08:34:20 +00:00
Michael 66f5e7c0f8 Don't store URL with hashtags / OStatus-Diaspora-Improvements 2020-04-19 07:24:36 +00:00
Michael ea60660c6d Central function to fetch the type for a given hash 2020-04-18 21:01:43 +00:00
Michael 9e9a104320 Tags can now be added and removed from photos 2020-04-18 20:46:41 +00:00
Michael c2d1d11123 Use constants 2020-04-18 16:14:38 +00:00
Michael 0f2215bc17 Hybrid mode for non resolvable contacts 2020-04-18 16:00:06 +00:00
Michael 5d34a90d67 Store mentioned contacts in another way 2020-04-18 14:41:26 +00:00
Michael 539a5c5da1 Fixes RegExp 2020-04-18 10:38:08 +00:00
Michael 3ce9386cb1 Improved body scanning, increased length 2020-04-18 10:05:30 +00:00
Michael c446712d08 Added documentation 2020-04-17 07:58:54 +00:00
Michael db657b0149 We now store the tags in two separate tables 2020-04-17 06:35:20 +00:00
Michael d3f4e4d629 Don't insert empty terms 2020-04-16 08:21:02 +00:00
Michael 5ef05b3703 Added uri-id to the constant 2020-04-16 04:20:59 +00:00
Michael a0d4e330b9 Spaces 2020-04-16 04:20:06 +00:00
Michael 4808aa431a Use the own constants 2020-04-15 16:38:52 +00:00
Michael 2e0501e7c5 New model class for tag 2020-04-15 16:37:09 +00:00
Michael f52614e249 Merge remote-tracking branch 'upstream/develop' into term2tag 2020-04-15 11:31:52 +00:00
Michael 54a4b4df3b Whitespace removed 2020-04-15 05:33:11 +00:00
Michael 2b41229a6a Merge branch 'item-select' of github.com:annando/friendica into item-select 2020-04-15 05:31:26 +00:00
Michael 8e3eceaeb0 Merge remote-tracking branch 'upstream/develop' into item-select 2020-04-15 05:30:04 +00:00
Michael 496d882d06 Fix: some selected item fields hadn't been selected 2020-04-15 05:28:54 +00:00
Michael 0d5d0bb65a Fix: some selected item fields hadn't been selected 2020-04-15 05:24:36 +00:00
Michael e5a0ff9572 Fix for missing fields 2020-04-15 05:11:45 +00:00
Michael 661dd43b0d Term constants updated 2020-04-13 19:24:22 +00:00
Michael 552fd98657 The "sign" table had been removed 2020-04-13 16:27:40 +00:00
Michael 01c6179feb Check for Antelope and convert to Barracuda 2020-04-01 18:11:06 +00:00
Michael d3722c945b Improved Mime Type detection 2020-04-01 05:42:44 +00:00
Michael 4aa89368ad Prevent putting much stress on remote systems 2020-03-30 06:22:32 +00:00
Michael e17e385c41 Fix: Queries with empty selections hadn't worked anymore 2020-03-29 12:29:57 +00:00
Michael 979199c442 Should fix the unknown "internal-psid" field 2020-03-29 11:16:40 +00:00
Tobias Diekershoff cb1696bfaf
Merge pull request #8464 from annando/notice 
Fixes two notices
 2020-03-29 08:37:57 +02:00
Michael Vogel 1194f9a58c (hopefully) Fixes "Undefined index: internal-psid" 2020-03-28 23:11:57 +01:00
Michael 2ba4333f70 Exchange "part" with "fragment" 2020-03-28 15:18:12 +00:00
Michael 3761e9ee51 Issue 8254: Some more fixes for too long data for columns 2020-03-28 15:14:40 +00:00
Michael 6f22e3909b Issue 8254 More length shortenings 2020-03-25 23:18:07 +00:00
Michael 6249b674dc Issue 7892: Improve "plink" generation for Diaspora posts 2020-03-25 16:42:53 +00:00
Michael 0486050d96 Issue 8254: Length restriction for "title" and "uri" 2020-03-25 07:07:34 +00:00
Michael 1fef1ef6e9 Issue 7771: Funkwhale support 2020-03-24 23:12:53 +00:00
Hypolite Petovan 1187742c14 Skip Contact::getDetailsByURL when url is empty in GContact::searchByName 
- Address https://github.com/friendica/friendica/issues/8000#issuecomment-602169147
 2020-03-22 22:46:22 -04:00
Michael bc069c8ebf Prevent endless loops and long running feed processing 2020-03-22 13:05:35 +00:00
Michael fc7ac75ba4 Issue 8371: More enhanced logging 2020-03-22 12:51:37 +00:00
Michael f8d20b365f We should use "self" 2020-03-22 09:59:06 +00:00
Michael 2c6c6579af Issue 8371: Enhanced logging for picture problem 2020-03-22 09:57:46 +00:00
Michael 6de2b0f6d4 Reworked permission stuff 2020-03-21 18:30:40 +00:00
Michael 4f61af2f5f Issue 8371: Alternate Solution 2020-03-21 16:36:40 +00:00
Michael 505cca942b Fix wrong variable name 2020-03-12 18:58:48 +00:00
Michael e1786b6747 Avoid warning in gcontact.php 2020-03-12 17:31:28 +00:00
Michael 7863406080 Prevent "null" permissions on photos 2020-03-12 06:20:49 +00:00
Michael 88522fc832 Set the picture accesibility separate from the permissions 2020-03-11 21:36:29 +00:00
Hypolite Petovan 737b04d7e2
Merge pull request #8401 from annando/gfollower-epilogue 
Reduce the load of "gfollower"
 2020-03-10 18:52:31 -04:00
Michael 59f58f999d Small fixes 2020-03-10 22:51:05 +00:00
Michael c261457b03 Store the interaction date as well. 2020-03-10 22:04:03 +00:00
Michael 07a487cfdc Fixed indentation 2020-03-10 21:21:48 +00:00
Michael f27900ad78 Reduce the load of "gfollower" 2020-03-10 21:10:59 +00:00
Michael 8e421f0893 Fix uninstall of installed addons 2020-03-09 23:28:37 +00:00
Hypolite Petovan 07dde8deb8 Remove unused return value of Contact::updateAvatar 2020-03-09 11:39:48 -04:00
Hypolite Petovan 89534b5be3 Ensure non-NULL values in $data array in Contact::updateAvatar 
- Throw Exception instead of returning false if contact doesn't exist
- Address https://github.com/friendica/friendica/issues/7998#issuecomment-596271239
 2020-03-09 11:13:09 -04:00
Hypolite Petovan 2702732308 Import FriendicaNetwork\HTTPException in Model\Contact 2020-03-09 11:11:06 -04:00
Michael c514da1738 Fix fatal error (TypeError) 2020-03-09 08:59:56 +00:00
Hypolite Petovan 8c10099abf
Merge pull request #8387 from annando/gcontact-discovery 
Performance changes to the gcontact discovery
 2020-03-09 01:30:44 -04:00
Michael 03e8609e4e Performance changes to the gcontact discovery 2020-03-08 19:48:26 +00:00
Michael 37376fa715 Issue 8371: Improvements for picture permissions 2020-03-08 13:16:59 +00:00
Michael e14ed2ce35 Issue 8151: Automatic Friend is working again 2020-03-07 23:19:19 +00:00
Hypolite Petovan 8487e0be17
Merge pull request #8368 from annando/ap-stuff 
AP: Bugfixing / GContact discovery
 2020-03-07 06:40:57 -05:00
Michael 2722c8e595 Some systems return an array instead of a string for the followers/following 2020-03-07 11:16:10 +00:00
Michael d6905e29cf Query the same contact only once a month 2020-03-07 05:31:03 +00:00
Hypolite Petovan e6e4baa872 Return early if link is missing from share block in Model\Item 
- Address https://github.com/friendica/friendica/issues/7998#issuecomment-594992869
 2020-03-06 20:49:43 -05:00
Michael 9adf09be51 Don't delete and recreate the rows over and over again 2020-03-06 13:51:36 +00:00
Michael bd77556b49 New table for relations between global contacts - will replace glink in the future 2020-03-06 08:08:49 +00:00
Michael 10d866bad9 Only perform a PoCo discovery when hadn't been one via AP 2020-03-06 07:06:02 +00:00
Michael 1ce9a31ca4 Simplified code 2020-03-06 06:44:17 +00:00
Michael 2f63249f3b Only log when there is data 2020-03-05 22:24:31 +00:00
Michael 652a4ec9c7 Bugfixing 2020-03-05 22:17:17 +00:00
Michael a6e7b5f295 GContact discovery added 2020-03-05 22:03:24 +00:00
Hypolite Petovan 1afb49f412
Merge pull request #8366 from annando/issue-8321 
Issue 8321: Follow items now work again
 2020-03-05 08:44:41 -05:00
Michael a55057d974 Function renamed to better reflect the purpose 2020-03-05 08:03:05 +00:00
Michael 825a7f9f93 Issue 8321: Follow items now work again 2020-03-05 07:16:47 +00:00
Michael Vogel aa3194b8ba
Merge pull request #8359 from MrPetovan/bug/7134-local-post-deleted 
Add callstack context to cascade deletion debug logging
 2020-03-04 22:02:16 +01:00
Hypolite Petovan f047944b2d Switch all item deletion logging to info level 2020-03-04 15:59:19 -05:00
Michael 8410c5e283 The direction field needs to be removed 2020-03-03 22:43:19 +00:00
Hypolite Petovan 86a6268aac Add guid context to item deletion logging 2020-03-03 12:01:03 -05:00
Michael af6db65961 Store the push/pull direction in the conversation table 2020-03-03 08:01:04 +00:00
Hypolite Petovan 6ae5f705b6 Rename Item::delete* methods to Item::markForDeletion* 2020-03-03 01:48:29 -05:00
Hypolite Petovan dd613cda45
Merge pull request #8357 from annando/private 
Support unlisted public posts
 2020-03-03 01:19:07 -05:00
Michael 72c198990e Merge remote-tracking branch 'upstream/develop' into private 2020-03-02 15:05:00 +00:00
Hypolite Petovan 25dceccf77 Add debug for item deletion 2020-03-02 09:30:34 -05:00
Michael ca1b92bb34 Support unlisted public posts 2020-03-02 07:57:23 +00:00
Hypolite Petovan dd999164c6 Do not cache Contact::getDetailsByURL result if it doesn't come from the DB 
- Address https://github.com/friendica/friendica/issues/8000#issuecomment-592169621
 2020-02-29 11:41:33 -05:00
nupplaPhil 811f075aa1
Rename method name 2020-02-29 17:10:34 +01:00
nupplaPhil ed422be734
Improve start/count parameter 2020-02-29 17:10:33 +01:00
nupplaPhil 3a317c5c0d
More list sub commands 2020-02-29 17:10:32 +01:00
nupplaPhil 2adc6a0974
Add list command 2020-02-29 17:10:31 +01:00
nupplaPhil 0c3f8b124b
Add "User::block()" to console command 2020-02-29 17:10:28 +01:00
nupplaPhil b4f6e8fda1
Move "User::deny()" to own method and update usages 2020-02-29 17:10:28 +01:00
nupplaPhil 6aee153bbd
Move "User::allow()" to own method and update usages 2020-02-29 17:10:27 +01:00
nupplaPhil f3f764bc39
Add new possibility to add a user per console 2020-02-29 17:10:27 +01:00
Hypolite Petovan c0f2ef4ab0 Only show remote follow button for local profiles 2020-02-27 22:14:00 -05:00
Hypolite Petovan b100b9600e Add rel="noopener noreferrer" to all target="_blank" links 
See https://mathiasbynens.github.io/rel-noopener/
 2020-02-24 20:07:34 -05:00
Michael d03fb89494 Replace "hidewall" with "net-publish" / other "hidewall" stuff 2020-02-20 17:24:41 +00:00
Michael 7ee9aad6ca Some more unneeded settings removed 2020-02-19 19:31:55 +00:00
Hypolite Petovan 858b63656e
Merge pull request #8306 from annando/contact-unfollow-delete 
Don't show "delete contact" when there is a follow or unfollow option
 2020-02-19 11:44:49 -05:00
Michael efddd248f7 "remote_follow" is now "remote_comment" 2020-02-18 17:31:02 +00:00
Michael d64bb0dd8f Remotely load posts to comment on them on the own page 2020-02-18 06:57:38 +00:00
Michael f8670b6268 Don't show "delete contact" when there is a follow or unfollow option 2020-02-17 22:25:12 +00:00
Philipp da124af6ed
Merge pull request #8293 from MrPetovan/task/5562-community-pagination 
Improve community pagination
 2020-02-16 19:38:49 +01:00
Hypolite Petovan e0d03615bc Add node-wide default items per page config 2020-02-16 13:04:26 -05:00
Hypolite Petovan 561472b975 Add L10n parameter to Pager classes 2020-02-16 12:50:39 -05:00
Michael ee6cceba30 Clarify the effect of "net-publish" 2020-02-16 15:39:44 +00:00
Michael 3bd1f3a836 No more gender 2020-02-16 10:55:18 +00:00
Hypolite Petovan 0b0309ce8f Remove pager parameter from conversation() 
- Add getUrlParameter() Javascript function to determine current page
 2020-02-13 23:40:00 -05:00
Michael Vogel e80d68ba53
Merge pull request #8261 from MrPetovan/task/8251-use-about-for-pdesc 
Use profile.about for profile description
 2020-02-10 23:36:59 +01:00
Hypolite Petovan 097620b627
Merge pull request #8230 from AlfredSK/AlfredSK-statistics-query 
Changed statistics query for nodeinfo
 2020-02-09 17:54:22 -05:00
Hypolite Petovan 2ec3a97393
Merge pull request #8263 from annando/remote-follow 
New page for remote follow requests
 2020-02-09 17:53:13 -05:00
Michael 2eebeeaa32 New page for remote follow requests 2020-02-09 17:04:35 +00:00
nupplaPhil 23c64b9a11
Add license info at Friendica classes 2020-02-09 15:45:36 +01:00
Hypolite Petovan a42104ce43 Use profile.about instead of profile.pdesc for profile description 2020-02-09 02:36:19 -05:00
Hypolite Petovan 1a3807d598
Merge pull request #8249 from annando/a11y-4 
Useless links removed / Item menu is moved to the item actions bar
 2020-02-07 06:55:20 -05:00
Michael 6e02105d88 Useless links removed / Item menu is moved to the item actions bar 2020-02-06 22:06:24 +00:00