Commit graph

2348 commits

Author SHA1 Message Date
Michael
15162b4027 New table "post-thread-user" 2021-01-31 18:32:22 +00:00
Michael
998f127cb8 Prevent "No post-content stored" 2021-01-31 12:26:25 +00:00
Hypolite Petovan
9885c1f128
Merge pull request #9890 from annando/post-content
New table "post-content"
2021-01-30 18:01:13 -05:00
Michael
41061a7ec1 Avoid "Duplicate entry" 2021-01-30 22:39:06 +00:00
Michael
c3398511b4 New table "post-content" 2021-01-30 22:03:53 +00:00
Michael
722083f9ed Avoid non numeric parameter 2021-01-29 23:41:42 +00:00
Hypolite Petovan
9a4128a5c8
Merge pull request #9873 from annando/post-user
New "post-user" structure, new update  functionality
2021-01-28 19:32:17 -05:00
Michael
9a9674d5fb New "post-user" structure, new update functionality 2021-01-28 22:45:54 +00:00
Michael Vogel
199f72ee3c
Merge pull request #9823 from MrPetovan/task/9677-2fa-remember-device
Add "Remember this device" feature to two factor authentication
2021-01-27 22:32:08 +01:00
Michael
ef0400fc19 "uri-id" instead of "uri" or "id" 2021-01-27 10:01:42 +00:00
Hypolite Petovan
82e094179c Rename notify classes according the feature name, not the table name 2021-01-24 09:33:23 -05:00
Hypolite Petovan
3e257d4266 Move all two-factor authentication classes in Security\TwoFactor 2021-01-23 05:42:58 -05:00
Hypolite Petovan
c644d76d28 Allow setting arbitrary keys in the cookie array 2021-01-23 05:42:58 -05:00
Hypolite Petovan
e2c38f1347 Prevent hashtag parsing and replacement in image alternative text 2021-01-22 17:45:28 -05:00
Michael
4002bd9b97 Don't create a user-item entry on default 2021-01-22 08:16:41 +00:00
Michael
fbcc59cc1d Some more removed functionality from FileTag class 2021-01-21 20:25:06 +00:00
Michael
d2ea3eabfb Replace legacy file/category handling 2021-01-21 07:16:41 +00:00
Michael
a773a72eaa The "icid" field is deprecated 2021-01-19 23:26:24 +00:00
Michael
b892db0cf3 All item selects are now done by the post class 2021-01-19 07:23:01 +00:00
Michael
9ccfa37d3c Fixes 9814 - again 2021-01-18 20:19:13 +00:00
Michael
f9430175c6 Avoid multiple lines in post-view, added thread view 2021-01-18 07:10:04 +00:00
Michael
ff8b578cde Fix the test data / unused function removed 2021-01-17 22:20:46 +00:00
Michael
4157db5473 "item" is replaced by "post-view" / postupdate check added 2021-01-17 20:32:13 +00:00
Michael
e775be38c8 Fix failed query 2021-01-16 23:24:48 +00:00
Michael
2b1d0b9db8 "selectForUser" and "" selectFirstForUser" is now moved to Post 2021-01-16 22:37:27 +00:00
Michael
b0d1a295fe New post class in model classes 2021-01-16 04:13:22 +00:00
Michael
f4addd337d New database version, fixes to empty field list 2021-01-14 22:51:44 +00:00
Michael
55204d26b1 Added function to count posts 2021-01-14 14:51:04 +00:00
Michael
8e12dd1658 Post view works now, "file" handling improved 2021-01-14 14:45:40 +00:00
Michael
ca16a4892b The item view is completed, unneeded fields removed 2021-01-13 07:23:57 +00:00
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