Commit graph

7180 commits

Author SHA1 Message Date
555856208e Issue 9167: Adding more direction indicators 2020-09-09 16:54:18 +00:00
6c5af09589 Added link encoding 2020-09-09 14:37:58 +00:00
206caaf51a Reshared data now is a link 2020-09-09 04:49:42 +00:00
42dcd6646e Issue 9135: Display only reshared posts at the top 2020-09-08 22:06:10 +00:00
Michael Vogel
065ab017c7
Merge pull request #9161 from MrPetovan/bug/9140-private-note-self-only
Add a self-only ACL block to personal notes jot
2020-09-08 03:57:11 +02:00
f1e36eac7d Update capitalization of "Permissions" translation string 2020-09-07 21:25:04 -04:00
c4267bbca0 Remove unused jot.tpl template variables 2020-09-07 19:27:23 -04:00
5b6ced9c6e Issue 9142: Make the message ID look more like a message ID 2020-09-06 17:47:25 +00:00
Michael Vogel
abe6ecf820
Merge pull request #9126 from MrPetovan/task/post-improvements
Various post display improvements
2020-09-03 22:17:25 +02:00
730a5c5725 Improve post direction display
- [frio] Change icon for commented direction
- Update English translation string for commented direction
2020-09-03 15:45:53 -04:00
9ea7f7d4ad [frio] Ensure tagsinput library is loaded in pages where new PM can be submitted
- The new private message page loads in a modal, requiring the base page to load them in advance
2020-09-03 10:03:36 -04:00
cef7af8fba Don't notify on own entries 2020-08-31 19:27:50 +00:00
f5504ed8d1 Improve notifications for announced posts 2020-08-31 18:51:59 +00:00
355284841a Optionally display the resharer as icon 2020-08-26 12:33:17 +00:00
6139f5883b Mark posts that arrived in your network stream via tag 2020-08-23 17:48:44 +00:00
1493875ec9 Speed improvement 2020-08-23 15:18:26 +00:00
15119f6a59 Added information about fetched post because of comment 2020-08-23 14:51:56 +00:00
e6431e53db Changed "reshared" description 2020-08-23 14:07:17 +00:00
0e4d3fe9e5 Display a symbol when a post had been reshared 2020-08-23 13:26:23 +00:00
1ab81266b9 Change the owner of a reshared item 2020-08-13 06:09:26 +00:00
fbb1ddd534 Unneeded fields removed 2020-08-12 08:39:04 +00:00
8488ed76e4 Don't create notifications for activities 2020-08-12 08:37:38 +00:00
60631f8a22 Avoid getting too much notifications 2020-08-12 06:50:02 +00:00
4ee858740e Create notifications for shared posts 2020-08-12 04:35:24 +00:00
1934c149a3 Suppress "reshared" information for forum posts 2020-08-10 08:26:09 +00:00
bf7128b4b2 AP Improvements for forums 2020-08-09 18:42:25 +00:00
1d44e544cf New class for group related contact actions 2020-08-04 18:22:19 +00:00
71b6226909 Some more avatar function replacements 2020-07-28 19:30:55 +00:00
Michael Vogel
d6a35c6995 Support newline as block contact separator 2020-07-19 03:21:15 +02:00
b0086a49e2 in "getidforurl" "no update" is now "update" 2020-07-15 21:08:42 +00:00
a13e004df0 Delete include/items.php
- Remove all references
2020-07-14 10:21:31 -04:00
3e25fc3a72 Replace *_page_info function calls with Content\PageInfo equivalent 2020-07-14 10:15:04 -04:00
a1d62734fa Remove consume_feed in favor of Protocol\Feed::consume 2020-07-14 10:14:05 -04:00
04c95a5045 Move logged in logging where it makes sense in include/api 2020-07-09 15:09:07 -04:00
dc5838ecf9
Merge pull request #8826 from annando/fix-logging
Replace deprecated Logger calls
2020-06-30 09:05:01 -04:00
a3e775f28c Account for false return value of Repository\Notify->insert in notification()
- Address https://github.com/friendica/friendica/issues/8473#issuecomment-651393541
2020-06-29 18:58:17 -04:00
c947b7f211 "print_r" in logging replaced / obsolete stuff removed 2020-06-29 20:22:00 +00:00
b6c7f247cc Replace array_unique with GROUP BY clause in api_fr_photoalbum_delete() 2020-06-25 08:05:09 -04:00
8272b16647 [API] Replace unwarranted Item::selectFirstForUser calls in photo endpoints
- Item::selectFirstForUser checks for item.visible = 1 which isn't necessarily set on photo-related items
2020-06-24 08:14:45 -04:00
ae6e9e7267 [API] Miscellaneous improvements
- Use empty() instead of isset($r) && $r in save_media_to_database()
- Use expected variable name for result array in api_fr_photo_delete()
- Use correct associative array references in prepare_photo_data()
- Replace a() call in api_fr_photoalbum_delete()
2020-06-24 08:11:47 -04:00
Michael Vogel
7fd2c00171
Merge pull request #8792 from MrPetovan/task/share-block-guid
[frio] Add local post link to share block when guid attribute is present
2020-06-23 21:26:07 +02:00
677eaf78ed Add API login capture 12h cooldown to spare database writes 2020-06-23 10:15:39 -04:00
43e6cec200 Update user.login_date for authenticated API calls 2020-06-23 09:09:23 -04:00
912ff069c0 Update getShareOpeningTag::getShareOpeningTag method signature
- Optional parameter $guid is now at the end
- Always provided parameter $posted is now mandatory
2020-06-21 09:42:37 -04:00
1f20111c80 Replace share_header calls with BBCode::getShareOpeningTag 2020-06-18 08:53:57 -04:00
f3323aff5e Deprecate page_info functions to new PageInfo class
- Add tests for parts not using remote requests
- Add scheme requirement for page info URLs
- Add policy to keep label from stripped Page Info links
2020-06-17 13:24:44 -04:00
eba964ec12 Deprecate consume_feed() in favor of Protocol\Feed::consume 2020-06-17 13:24:44 -04:00
e3d20b4366 Move subscribe_to_hub function to Worker/OnePoll from include/items
- It was its only usage
2020-06-17 13:24:44 -04:00
3d55ef1546 Move drop_items and drop_item out of include/items
- They were only used in mod/item
2020-06-17 13:24:44 -04:00
016c99935c Different comment limits for single view 2020-06-16 06:49:53 +00:00
Michael Vogel
f10062dfdb
Merge pull request #8617 from MrPetovan/task/8220-twitter-followers-list
(Re)Implement Twitter contact API endpoints
2020-06-14 16:06:22 +02:00
7a5afc10bb Implement Twitter contact endpoints
- Implement /followers/ids
- Implement /followers/list
- Reimplement /friends/ids
- Reimplement /friends/list
- Update API reference
- Remove obsolete tests
2020-06-09 08:36:46 -04:00
89b3ae2657 Add null/empty string parameter value case in BBCode::convert
- Remove obsolete coalesce operator uses
2020-06-08 19:15:08 -04:00
6774ee6691 Ensure strings are provided to BBCode::toPlaintext in include/api
- Prevents some type mismatch fatal errors with BBCode::performWithEscapedTags
2020-06-08 18:40:21 -04:00
8eeb7807d3 Replace remaining instances with "allowlist", "denylist" and "blocklist" 2020-06-07 11:24:56 -04:00
20b93306ad Handling situations where "vid" is empty 2020-05-31 14:38:00 +00:00
0acb5d4558 "parent = id" is replaced with gravity check 2020-05-28 16:02:36 +00:00
bdfe47dcfd Add the space at a different place 2020-05-28 06:08:03 +00:00
51e9b25700 Fixing #8702 2020-05-27 22:16:33 +00:00
973abb6196 Replace "id = parent" checks with "gravity" checks 2020-05-27 12:19:06 +00:00
ba9cf32f36 The "item-activity" is removed 2020-05-26 05:18:50 +00:00
3b1d89252a Issue 8582: "cid" in "network" is now "contactid"
Fixes #8582
2020-05-17 15:01:27 +00:00
0cf517ad76 Use constants for the BBCode modes 2020-05-16 16:28:15 +00:00
8b2c51baf2 Improved description 2020-05-15 18:08:47 +00:00
856cf7f664 Don't count and fetch "follow" activities 2020-05-07 18:39:39 +00:00
48f3234318 Useless space and useless "null" check 2020-05-04 14:50:22 +00:00
49db63da2b Merge remote-tracking branch 'upstream/develop' into notification-uri-id 2020-05-04 14:38:19 +00:00
00035f7ba0 Notifications are now storing the uri-id as well 2020-05-02 13:12:11 +00:00
b0cb6536dd The old tag handling is removed 2020-05-02 05:08:05 +00:00
74081a71ff Removed unused "use" 2020-05-01 13:26:13 +00:00
2b8dabcd95 API search is now done via "tag" as well 2020-05-01 09:41:17 +00:00
3b2ae5c4a9 function names changed 2020-05-01 06:01:22 +00:00
2423831b90 Added todo 2020-04-29 09:12:56 +00:00
7f5f68a904 More preparations for term to tag transition 2020-04-26 16:15:39 +00:00
5df5e9521b The tag table is now really used 2020-04-26 15:24:58 +00:00
43b8bdea07
Merge pull request #8520 from annando/term2tag
We now store tags in "tag"
2020-04-22 22:56:07 -04:00
1f7993acad Code standards 2020-04-22 15:22:39 +00:00
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
e365103ea3 Added todo 2020-04-17 13:35:12 +00:00
db657b0149 We now store the tags in two separate tables 2020-04-17 06:35:20 +00:00
9a0d2c9e0c The new tag table should work for feeds no as well 2020-04-15 05:10:40 +00:00
661dd43b0d Term constants updated 2020-04-13 19:24:22 +00:00
3c8216e385 Fix notice about an unknown variable 2020-04-05 17:25:36 +00:00
09cc3bfd0a Some more code standards 2020-04-05 07:11:47 +00:00
afc8783862 Code formatting 2020-04-05 07:08:20 +00:00
f280dcaa5e Issue 8493: Avoid fatal error when fetching items via API 2020-04-04 20:00:40 +00:00
40a7a43bd2 [frio] Add link to Compose page in jot 2020-04-03 16:33:00 -04:00
d3722c945b Improved Mime Type detection 2020-04-01 05:42:44 +00:00
6f22e3909b Issue 8254 More length shortenings 2020-03-25 23:18:07 +00:00
a16dba2941 a l10n call too much 2020-03-22 08:43:06 +01:00
83a9970891 Issue 8432: Make notifications translatable 2020-03-21 11:48:20 +00:00
bcf9430822 Only perform OAuth when no login data are provided 2020-03-08 08:30:19 +00:00
a55057d974 Function renamed to better reflect the purpose 2020-03-05 08:03:05 +00:00
3a6d3cd439 Fixing tests 2020-03-02 17:20:18 +00:00
72c198990e Merge remote-tracking branch 'upstream/develop' into private 2020-03-02 15:05:00 +00:00
ca1b92bb34 Support unlisted public posts 2020-03-02 07:57:23 +00:00
nupplaPhil
55a5e43715
Add UID as parameter for notify repository call 2020-03-01 22:24:53 +01:00
0112246a78
Restore removed announce key in conv_response array in include/conversation
- Follow-up to #8329
2020-02-26 15:53:46 -05:00
452d7e6404 Remove unused conversation response code
- Remove get_responses()
- Remove get_response_button_text()
- Remove title key from $conv_responses array
- Address https://github.com/friendica/friendica/issues/8000#issuecomment-589263329
2020-02-22 20:41:12 -05:00
637e38e535 User hide_dislike user setting to hide dislike button and conversation responses 2020-02-20 05:37:07 -05:00
Philipp
d09b3f5bde
Merge pull request #8302 from annando/allowed-chars
Added characters to the disallowed hashtag characters
2020-02-17 17:59:56 +01:00
Philipp
da124af6ed
Merge pull request #8293 from MrPetovan/task/5562-community-pagination
Improve community pagination
2020-02-16 19:38:49 +01:00
0b0309ce8f Remove pager parameter from conversation()
- Add getUrlParameter() Javascript function to determine current page
2020-02-13 23:40:00 -05:00
2a7de4213f Correctly initialize post actions button template variable
- Address https://github.com/friendica/friendica/issues/7999#issuecomment-586020764
2020-02-13 20:42:15 -05:00
Michael Vogel
1eec1349eb Added characters to the disallowed hashtag characters 2020-02-11 23:14:26 +01:00
2c56d2f336
Merge pull request #8265 from nupplaphil/task/add_license
Add license headers :-)
2020-02-09 16:34:21 -05:00
nupplaPhil
f69e3a2dc6
Fix Notification subject 2020-02-09 22:42:51 +01:00
nupplaPhil
7d714319c8
Add license info at Friendica PHP files 2020-02-09 16:34:23 +01:00
nupplaPhil
85dc9bb96b
Add license info at Friendica PHP files 2020-02-09 16:18:46 +01:00
nupplaPhil
2e98c05bd3
improvements/fixings 2020-02-05 22:22:12 +01:00
nupplaPhil
951b7179af
Move [Friendica:Notify] to a own PREFIX variable 2020-02-05 21:41:07 +01:00
nupplaPhil
511556085a
Move Notify::TYPE_SYSTEM 2020-02-05 21:41:07 +01:00
nupplaPhil
c6915dc672
Move Notify::TYPE_SHARE 2020-02-05 21:41:06 +01:00
nupplaPhil
a78e19ea76
Move Notify::TYPE_POKE 2020-02-05 21:41:05 +01:00
nupplaPhil
bee110dc0b
Move Notify::TYPE_TAGSHARE 2020-02-05 21:41:05 +01:00
nupplaPhil
51260f234f
Move Notify::TYPE_TAGSELF 2020-02-05 21:41:04 +01:00
nupplaPhil
88dc3efdc9
Move Notify::TYPE_SUGGEST 2020-02-05 21:41:03 +01:00
nupplaPhil
9435cc4b88
Move Notify::TYPE_MAIL 2020-02-05 21:41:02 +01:00
nupplaPhil
e6fb044e60
Move Notify::TYPE_COMMENT 2020-02-05 21:41:02 +01:00
nupplaPhil
b86ad37001
Move Notify::TYPE_WALL 2020-02-05 21:41:01 +01:00
nupplaPhil
6e45514e2c
Move Notify::TYPE_CONFIRM 2020-02-05 21:41:00 +01:00
nupplaPhil
cfd50f9abb
Move Notify::TYPE_INTRO 2020-02-05 21:41:00 +01:00
nupplaPhil
97b6f6b3b3
Move OTYPE constants to own enum class 2020-02-05 21:40:59 +01:00
nupplaPhil
1867267513
Add user array 2020-02-04 21:26:03 +01:00
nupplaPhil
cb08912926
split mailbuilder types 2020-02-04 21:14:39 +01:00
nupplaPhil
34dce9fd76
Introduce NotifyEmailBuilder 2020-02-04 21:14:39 +01:00
nupplaPhil
ed9756225d
improvements 2020-02-02 22:43:42 +01:00
nupplaPhil
0e13428210
Move "App::getSenderEmailAddress()" to "Emailer::getSiteEmailAddress()" 2020-02-02 22:43:40 +01:00
nupplaPhil
3291728059
Extract System emails from enotify
- Removed every SYSTEM_EMAIL occurrence in enotify
- Introduced a "SystemMailBuilder" for build system emails
- Replaced every SYSTEM_EMAIL usage in the classes with calling this builder
- Added tests for this new Builder
- Split the email templates between "base" template for email and concrete usages for different use cases
2020-02-02 22:43:35 +01:00
nupplaPhil
74490d6594
Cleanup enotify email
- Removing unused fields
- Move notify template to email subdirectory
2020-02-02 22:43:34 +01:00
Philipp
0406fe7ade
Merge pull request #8163 from MrPetovan/task/7817-custom-fields-part-3
New custom profile fields feature part 3: Updating the API
2020-01-31 22:39:11 +01:00
abbf036685
improve exception handling 2020-01-31 22:25:09 +01:00
7909d9c417
Notifications cleared for a whole thread in case of one mark seen 2020-01-31 21:34:12 +01:00
dd24b3bac0 Move api/profile/show to src/Module
- Update API documentation
- Update BaseApi::format to include headers by format
2020-01-29 23:31:37 -05:00
b2143cae53 [frio] Add new asynchronous submission of modal form
- Add loading state for jot submit buttons
2020-01-29 22:50:10 -05:00
c2b8c65104
Merge "notification" routes 2020-01-28 23:21:24 +01:00
91707a530c
Add default values for inserts 2020-01-28 22:26:23 +01:00
582f6bd4a3
Refactor API notification usage
- Remove "mapFields()" from BaseModel
- Add new Notification API entity (including collection)
- Add new NotificationFactory method "getApiList()"
2020-01-28 21:28:57 +01:00
ff9eb20663
Fix enotify item link 2020-01-28 18:41:46 +01:00
443e106105
Fix missing notifications:
- Add namecache in enotify
- Add "unset()" in notify repository for additional field "abort"
- Add possibility for additional, non-saved fields in model
2020-01-28 18:41:45 +01:00
a607656607 Replace profile tab GET parameter by route 2020-01-27 19:21:18 -05:00
Philipp
9827e933a2
Merge pull request #8179 from MrPetovan/bug/notices
Various notice fixes
2020-01-26 23:10:56 +01:00
765a0d8892
Some Renames:
- EMail => EMail
- toEmail => toAddress
- fromEmail => fromAddress
2020-01-26 23:47:16 +01:00
dde2cf6ac0 Throw not found exception when photo item doesn't exist in prepare_photo_data()
- Addresses part of https://github.com/friendica/friendica/issues/8000#issuecomment-573883153
2020-01-26 16:43:14 -05:00
2b8f067715
Introduce interface for emailing and create email classes 2020-01-26 21:35:04 +01:00
915abe8a33
Add explicit parameters to Sender::send() method signature 2020-01-26 21:35:03 +01:00
ea9d3b7438
Make EMailer util dynamic 2020-01-26 21:35:03 +01:00
Philipp
9269221825
Merge pull request #8175 from MrPetovan/task/revert-profile-default-tab
Revert profile base URL behavior
2020-01-26 20:33:27 +01:00
e5ab4f1889 Re-enable pinned items in profile wall 2020-01-26 14:21:20 -05:00
0840938dff
Rename classes
- Repository/Model Notification => Notify
- Factory/Object Notification => Notification
2020-01-26 20:30:24 +01:00
b85511b00d
Improvements:
- Fix API-select
- Introduce OTYPE-constants
- Rename `IntroductionFactory` methods
2020-01-26 14:33:10 +01:00
74f3a2f90c
Fix API result, add PHPDoc and cleanup object construction
Fix missing getters
fix data array
fix missing "$" for template-variables
Remove lazy-loaded parent notification instance (for now..)
2020-01-25 21:15:01 +01:00
0850fb88dd
ReWork Notification Model/Module/Object/Repository/Factory
- Introduce Repository for interaction with "notify" table
- Introduce Factory for read-only notification objects (they're just loosely based on notification the table!)
- Introduce Objects for type-safe usage at the presentation layer
- Reworked Model, which is now fully based on the notify table, including generated fields (cache, ..)
2020-01-25 19:58:22 +01:00
0f932ae723
Notify => Notification
Notifs => Notifications
2020-01-24 18:32:38 +01:00
6d7f0a6fd8 Remove duplicate profile_uid key in App->profile array 2020-01-20 07:32:46 -05:00
ed9392469e
Remove unneeded Config namespace usages 2020-01-19 22:50:44 +01:00
6c36fd9e01
Move Config::get() to DI::config()->get() 2020-01-19 21:21:13 +01:00
d6efc90194
cleanup namespace usages for L10n 2020-01-19 16:31:33 +01:00
d3255afa66
Move L10n::withLang() calls to DI::l10n()->withLang() calls 2020-01-19 16:31:18 +01:00
a9a36fb302
Move L10n::tt() calls to DI::l10n()->tt() calls 2020-01-19 16:31:17 +01:00
5dfee31108
Move L10n::t() calls to DI::l10n()->t() calls 2020-01-19 16:31:16 +01:00
0a4119adaf @brief is removed completely 2020-01-19 06:05:23 +00:00
800694e9b3
Remove unused use statements & remove PConfig class 2020-01-18 17:02:59 +01:00
9e9429b56d
Move PConfig::get() to DI::pConfig()->get() 2020-01-18 16:50:57 +01:00
b83f328983 Remove "f" parameter / network page parameter cleanup 2020-01-13 20:10:13 +00:00
ad11579eaa API: Use NOTIF_DIRECT_THREAD_COMMENT for the API mentions as well 2020-01-09 17:58:22 +00:00
469eefdc5b Notifications: Now declare direct thread answers as replies 2020-01-09 17:53:17 +00:00
3bf7664ee3 changed priority of messages 2020-01-08 22:36:31 +00:00
d9ea0fea87 Use "replied" 2020-01-08 21:59:12 +00:00
cabaea38ac Improved notification messages 2020-01-08 21:48:59 +00:00
4d5e15709c The item notifications now are based upon the "user-item" field 2020-01-06 00:59:18 +00:00
6670a2409f Fix condition creation 2020-01-05 19:48:01 +00:00
f134903fcf API: We now use the "notification-type" field for mentions 2020-01-05 19:32:39 +00:00
f0eea6f875
Remove get_app() in favor of DI::app() 2020-01-04 23:42:01 +01:00
ebaf726744 Rework Feed::import parameters
- Remove unused $hub
- Replace $simulate with an implicit condition
2020-01-03 09:26:28 -05:00
a4a7f19df1
Move redundant System::removedBaseUrl() to DI::baseUrl()->remove() calls 2019-12-30 23:03:56 +01:00
3f34229752
Move redundant System::baseUrl() to DI::baseUrl() calls 2019-12-30 23:00:08 +01:00
6d7362da41
Replace deprecated $a->page with DI::page() 2019-12-30 20:02:09 +01:00
4835f1185f
Remove deprecated App::module - replace with DI::module()->getName() 2019-12-29 20:17:52 +01:00
33674808dc
Remove deprecated App::cmd - replace with DI::args()->getCommand() 2019-12-29 20:17:51 +01:00
e6f61c2cc7
Remove deprecated App::query_string - replace with DI::args()->getQueryString() 2019-12-29 20:17:50 +01:00
50be94aa5e
Remove deprecated App::getHostName() - process methods to DI::baseUrl()->getHostName() 2019-12-29 20:17:47 +01:00
8e6973b774
Refactor deprecated App::internalRedirect() to DI::baseUrl()->redirect() 2019-12-29 20:17:43 +01:00
181529f3df
Refactor dynamic App::getProfiler() to static DI::profiler() 2019-12-29 20:17:42 +01:00
e2b2778e0a
Refactor dynamic App::getLogger() to static DI::logger() 2019-12-29 20:17:41 +01:00
388b963714
Replace BaseObject class with DI::* calls 2019-12-29 20:17:38 +01:00
1de3f186d7
Introduce new DI container
- Adding Friendica\DI class for getting dynamic classes
- Replacing BaseObject::getApp() with this class
2019-12-29 20:16:55 +01:00
7a2f4dc54e
Make L10n immutable
- Remove Push/Pop
- Add "withLang($lang)" method
2019-12-28 23:12:01 +01:00
c037e9143c Additionally display the protocol together with the network 2019-12-27 17:24:29 +00:00
00756737b5 Merge branch 'master' 2019.12 into develop 2019-12-23 20:03:47 +01:00
30dfbb95d9 Remove legacy function 2019-12-20 06:40:41 +00:00
295ee82a61 Changed "??" to "?:" 2019-12-19 12:39:30 +00:00
6dbaf34290 Issue 7685: Just forward on remoteauth for non legacy-DFRN and other contacts 2019-12-19 11:02:50 +00:00
1c7bc56cb3 API: Missing endpoint for reshares had been added 2019-12-19 07:19:03 +00:00
3a6a78ca46 Issue 7664: Don't notify every time a contact posted something 2019-12-18 06:36:43 +00:00
533f07e874 Issue 6867: Only display direct mentions in the corresponding API endpoint 2019-12-15 13:14:55 +00:00
Michael Vogel
b2ae39db1a
Merge pull request #7943 from MrPetovan/bug/7920-api-fix-followers-friends-ids
Add relationship filter to api_friends_ids and api_followers_ids
2019-12-13 21:34:09 +01:00
c2233e3416
Merge pull request #7947 from annando/api-attachments
API: Improved handling of quoted posts and attachments
2019-12-13 15:15:34 -05:00
c9c30e4a23 Add relationship filter to api_friends_ids and api_followers_ids 2019-12-13 11:43:45 -05:00
81b9d25906 Add relationship filter to api_ff_ids() 2019-12-13 11:43:20 -05:00