Commit Graph

1825 Commits

Author SHA1 Message Date
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