1
1
Fork 0
Commit graph

3184 commits

Author SHA1 Message Date
61fe82ad20
Merge pull request #6846 from annando/fix-mentions
Fix for the automatic mentioning
2019-03-10 07:03:31 +01:00
337a3bb1aa Fix for the automatic mentioning 2019-03-10 05:41:40 +00:00
4d70e32829 Add new Content\Text\MarkdownParser
- Add autolinker to MarkdownParser->doAutoLinks()
- Set hashtag_protection and url_filter_func properties of MarkdownParser
2019-03-09 23:28:50 -05:00
184b51ec56 Move autolink regex in Util\Strings 2019-03-09 23:25:53 -05:00
ad854d5d40 Define absolute paths for various includes
- Fix errors running local tests in IDE
2019-03-09 23:21:19 -05:00
a2ec9e676e
Revert "Avoid double update runs" 2019-03-09 18:28:48 -05:00
f7c7851c2d
replaced duplicate code with method 2019-03-09 20:50:06 +01:00
20498d1d40
replaced duplicate code with method 2019-03-09 20:50:00 +01:00
7047a13ffa
added phpdoc 2019-03-09 20:49:59 +01:00
e46a7cdf80
Avoid double update runs 2019-03-09 20:49:59 +01:00
85609cd5e4 Fix autolinker regular expression to match test data 2019-03-09 10:20:57 -05:00
Philipp
792a0f11c0
Merge pull request #6839 from MrPetovan/bug/6829-fix-implicit-mention-regex
Fix implicit mention regex
2019-03-09 15:49:43 +01:00
d0b2ed7966 Remove test code in ActivityPub\Processor 2019-03-09 09:04:43 -05:00
70782b3977 Fix implicit mention detection regular expression flags in ActivityPub\Processor 2019-03-09 09:04:11 -05:00
50b7d95b2a
Set Timezone to 'UTC' for every Logger 2019-03-09 14:28:31 +01:00
af77af0446
Merge pull request #6833 from MrPetovan/bug/notices
Fix various notices
2019-03-09 09:12:09 +01:00
c4bfc6e86e
Merge pull request #6834 from MrPetovan/bug/6819-prevent-blocked-server-relay
Prevent accepting relayed posts from blocked servers
2019-03-09 09:10:28 +01:00
379f4d18c3 Update autolinker regular expression in Text\BBCode
- Thanks to https://daringfireball.net/2010/07/improved_regex_for_matching_urls
2019-03-08 23:58:20 -05:00
704cb052ca Add server block provision to Diaspora::postAllow 2019-03-08 22:40:08 -05:00
d40cbdce32 Remove unnecessary @throws tag in Util\Network 2019-03-08 22:39:08 -05:00
5f2a66e66c Add check for EXIF data existence in Object/Image
- Addresses https://github.com/friendica/friendica/issues/6338#issuecomment-467121955
2019-03-08 22:09:41 -05:00
6f07bfb772 Add missing fields to Register::getPending()
- Addresses https://github.com/friendica/friendica/issues/6338#issuecomment-470882973
2019-03-08 21:57:18 -05:00
ea71a4e83a Refetch new jobs only once per execution loop 2019-03-08 20:39:58 +00:00
5df246e9af
Merge pull request #6825 from annando/empty-spawn
Worker: Don't spawn without jobs
2019-03-08 07:26:22 +01:00
d87abe9563 Worker: Don't spawn without jobs 2019-03-08 05:53:36 +00:00
4901cf76dc
Merge pull request #6818 from MrPetovan/bug/6812-fix-delivery-namespaces
Fix namespace ambiguity about Model\Queue in Worker\Delivery
2019-03-07 06:08:49 +01:00
77a591e6e3 Fix namespace ambiguity about Model\Queue in Worker\Delivery 2019-03-06 23:17:58 -05:00
e89d56be6d Improved contact update from probe 2019-03-07 00:13:39 +00:00
07bd4cec65
Fixing redis cachekey 2019-03-04 21:28:36 +01:00
d7426e697d
Fixing redis cachekey 2019-03-04 21:09:20 +01:00
3e53dab817
Fixing redis cachekey 2019-03-04 21:00:41 +01:00
Philipp
9d0aaf3c67
Merge pull request #6807 from MrPetovan/bug/6800-fix-contactblock-relationship-direction
Fix relationship direction in Widget/ContactBlock
2019-03-04 15:17:21 +01:00
79f2b42f74 Fix relationship direction in Widget/ContactBlock 2019-03-04 08:40:53 -05:00
Philipp
a5d86fe787
Add default value for config.sitename in App::initHead
- Protect $this->page['title'] even more

Co-Authored-By: MrPetovan <hypolite@mrpetovan.com>
2019-03-04 07:54:51 -05:00
8fdf1db032 Restore module custom title display 2019-03-04 06:47:40 -05:00
Philipp
e157c89dc7
Merge pull request #6798 from annando/key-warning
Added warning about an empty key
2019-03-04 08:30:20 +01:00
a911baf8e5 Avoid transmitting a deletion message when we don't have a key 2019-03-04 06:52:43 +00:00
888e2ce2a9 Added forgotten "use" 2019-03-03 07:05:57 +00:00
3237dab1a4 Added warning about an empty key 2019-03-03 07:01:11 +00:00
f2560c42d1 Reduce the default maximum load for the worker to 20 2019-03-02 18:41:12 +00:00
9427d7f628 We have to fetch the data this way 2019-03-02 13:07:29 +00:00
16c2ae89e8 Sent update mails to administrators only once 2019-03-02 12:57:47 +00:00
16ff5af221
Fix handling table name during storage move 2019-03-01 18:07:08 +01:00
53952bb426
Merge pull request #6775 from annando/issue-6395
Issue 6395: Don't log details to avoid memory issues
2019-02-28 10:17:01 +01:00
0b2cdf5d26 Issue 6395: Don't log details to avoid memory issues 2019-02-28 09:07:24 +00:00
9cdae18101 Improve reshare format for Diaspora destinations
- Add link to original post in post time
- Update optional bottom link label
2019-02-27 21:01:47 -05:00
fb965f4d81
Merge pull request #6773 from nupplaphil/issue/6772-update_query_missmatch
Update - query missmatch
2019-02-27 15:22:42 -05:00
739449926c
'%' is deprecated 2019-02-27 20:30:08 +01:00
4a47425bfd
admin mail list seems wrong escaped 2019-02-27 20:17:35 +01:00
2b53784094
Reuse existing Strings::getRandomHex function 2019-02-27 18:32:25 +01:00
7217d24a97 Replace isset by array_key_exists on array class constant in Model\Term
- Addresses https://github.com/friendica/friendica/issues/6386#issuecomment-467835406
2019-02-27 08:00:04 -05:00
c3b12b63c8 Added some description, changed logger call 2019-02-27 09:49:26 +00:00
505a34d40e Log the time as decimal 2019-02-27 09:12:40 +00:00
78960d4bde Removed unneeded spaces 2019-02-27 09:11:37 +00:00
5e440aa035 The cron interval is minutes - so we have to convert it into seconds 2019-02-27 08:55:25 +00:00
0ee1ea5f29 The log text is now shorter 2019-02-27 08:41:45 +00:00
11e39da6cc And moving the block back to the old place 2019-02-27 07:08:44 +00:00
e1cc7262de Respawing when quitting 2019-02-27 07:04:21 +00:00
528636c9f4 Using constants is nicer 2019-02-27 06:55:04 +00:00
fb371e1048 Merge remote-tracking branch 'upstream/2019.03-RC' into worker2 2019-02-27 06:41:14 +00:00
40573120b9 Enhanced logging, stopping worker after cron lifetime 2019-02-27 06:36:19 +00:00
bd7aaacfb0 fixing links in photoMenu 2019-02-26 10:19:08 +01:00
97eb2ba053 Fix possibly undefined after index in Text\BBCode 2019-02-25 07:12:01 -05:00
05d8bf6b54 Fix wrong use of array_shift in Core\Worker 2019-02-25 07:11:35 -05:00
f597f3b378 Protect access to rel attribute in Network\Probe 2019-02-25 03:39:40 -05:00
3e290da8c2 Code standards: Add missing space in ActivityPub\Processor 2019-02-25 03:16:18 -05:00
1f6e0f168c Add missing author contact in ActivityPub\Processor
- Add logging for future occurrences
- Addresses https://github.com/friendica/friendica/issues/6338#issuecomment-466812104
2019-02-24 15:52:03 -05:00
Michael Vogel
4c6c5786ad
Merge pull request #6752 from MrPetovan/bug/notices
Fix various notices
2019-02-24 21:30:07 +01:00
Michael Vogel
69777c275b
Merge pull request #6751 from MrPetovan/bug/fatal-errors
Add missing use statement in Model\Term
2019-02-24 21:07:13 +01:00
e66768a058 Add empty entry author if contact query fails in DFRN
- Addresses https://github.com/friendica/friendica/issues/6338#issuecomment-462722599
2019-02-24 14:00:40 -05:00
0888850702 Fix missing avatar key in DFRN
- Addresses https://github.com/friendica/friendica/issues/6338#issuecomment-456839092
2019-02-24 13:40:04 -05:00
42c06506ce Stop appending entry when parent is missing in OStatus
- Addresses https://github.com/friendica/friendica/issues/6338#issuecomment-455785854
2019-02-24 13:36:37 -05:00
82072bae46 Add missing use statement in Model\Term 2019-02-24 13:33:11 -05:00
458064ddde
Merge pull request #6749 from nupplaphil/6386-php_fatal
Fixing appending child at DFRN without a parent id.
2019-02-24 12:55:34 -05:00
5d13b94761
update phpdoc 2019-02-24 16:31:16 +01:00
bf6a765beb
Fixing appending child at DFRN without a parent id. 2019-02-24 16:30:09 +01:00
Michael Vogel
efe358c617
Merge pull request #6746 from nupplaphil/issue/6338-notices
Fixing notices
2019-02-24 15:44:54 +01:00
Michael Vogel
fa5525d084
Merge pull request #6726 from MrPetovan/task/6676-fix-implicit-mentions
Fix last batch of implicit mentions issues
2019-02-24 15:40:11 +01:00
5b932867c3
Fixing https://github.com/friendica/friendica/issues/6338#issuecomment-466749280 2019-02-24 15:22:14 +01:00
Michael Vogel
df5ea1fab0
Merge pull request #6732 from MrPetovan/bug/1777-fix-blocked-contact-group
Allow to remove blocked contact from groups
2019-02-24 14:30:36 +01:00
Michael Vogel
a51c6549ad
Merge pull request #6744 from nupplaphil/task/namespace_to_class
Replace string namespace with *::class
2019-02-24 14:27:48 +01:00
e48c608db0
removed silent fail of logfile permission (should get fixed with #6745 ) 2019-02-24 13:57:17 +01:00
5fc42a744e
Replace string namespaces with ::class 2019-02-24 13:40:54 +01:00
4e3f780621
Merge pull request #6740 from nupplaphil/issue/6503-force_update
Fixing force-flag for lock-release
2019-02-24 07:04:54 -05:00
d1c7815c4e
added whitespace 2019-02-24 12:51:58 +01:00
aae58815a8
Adjust update parameters:
-f|--force         Force the update command (Even if the database structure matches)
-o|--override      Override running or stalling updates
2019-02-24 12:24:09 +01:00
4bad2645e5 We should execute the worker job for normal situations ;-) 2019-02-24 10:52:40 +00:00
ee300a7db6 Ensure that the database update will be processed anyway 2019-02-24 10:43:29 +00:00
7ce549c294
fixing delete 2019-02-24 10:27:56 +01:00
9b07132b80
Fixing force-flag for lock-releasing 2019-02-24 10:08:28 +01:00
Michael Vogel
9f11476ca0
Merge pull request #6737 from MrPetovan/bug/6630-fix-empty-label-profile
Fix "EMPTY" label in profile
2019-02-24 06:34:48 +01:00
dbcca9cfac Hide "never" on profile 2019-02-23 18:37:51 -05:00
b2e41e3298 Replace EMPTY value by empty value in profile selectors 2019-02-23 18:37:48 -05:00
6376293218 Merge /contactgroup module with Group module 2019-02-23 17:32:40 -05:00
7ab986bc97 Move group module to src/ 2019-02-23 17:32:40 -05:00
b939faf4ef Add contact removal from all groups when blocked 2019-02-23 17:32:40 -05:00
7e499647e3 Add System::jsonError method for ajax call returns 2019-02-23 17:32:40 -05:00
f4745c5936 Add doc to Model\Term 2019-02-23 17:32:13 -05:00
67aa188830 Improve Logger calls
- Add context in various calls
- Remove deprecated Logger::log call in Processor
2019-02-23 17:32:13 -05:00
cb78e77850 Fix implicit mentions in outgoing ActivityPub posts
- Add usage of system.disable_implicit_mentions to disable implicit mention behavior
- Add usage of item own implicit mentions to be prepended to the outgoing body
2019-02-23 17:32:12 -05:00
3ac8576c8e Fix implicit mentions in incoming ActivityPub posts
- Use thr-parent instead of parent-uri to retrieve implicit mentions to remove from body
- Add potential implicit mentions to 'tags' array for storage in Processor::convertImplicitMentionsInTags()
- Add usage of system.disable_implicit_mentions to disable implicit mention behavior
2019-02-23 17:32:12 -05:00
fc47a07801 Fix Diaspora outgoing implicit mention
- Use name instead of nick for implicit mention
- Rename $parent to $toplevel_item in Diaspora::constructComment
- Use thread parent to retrieve the expected mention instead of the top level item
2019-02-23 17:32:12 -05:00
e51f2cea0d Add implicit mentions to explicit mentions default text 2019-02-23 17:32:12 -05:00
0cc0df9e3e Rename system.disable_mentions_removal config key to system.disable_implicit_mentions
- Update configuration key description
2019-02-23 17:32:11 -05:00
34bc0b0c97 Add potential debug display of implicit mentions in frio
- Refactored conversation() by removing extraneous intermediary variables
2019-02-23 17:32:11 -05:00
8c1db51a76 Improve Logger calls
- Replace various deprecated Logger::log calls
- Reassign log level for verbose log calls
2019-02-23 17:32:11 -05:00
1917f04153 Rewrite Term class
- Move term type constants from TERM_* to Term::*
- Move term object type constants from TERM_OBJ_* to Term::OBJECT_TYPE_*
- Add Term::isType() method
- Add Strings::startsWith()  method
2019-02-23 17:32:11 -05:00
cd53585101 Improve /itemsource display
- Add Item Id
- Add Item Terms
2019-02-23 17:32:10 -05:00
7320c5e8e8 Normalize Contact::magicLinkByContact method name 2019-02-23 17:32:10 -05:00
ed54345ce1 Only check once 2019-02-23 22:27:03 +00:00
28f7c72cc7 Don't allow calling the install page after the install had been processed 2019-02-23 21:58:35 +00:00
7703875b55 Fixes "Undefined property: Friendica\App::$queue" 2019-02-23 16:08:02 +00:00
44953f045e
Merge pull request #6730 from nupplaphil/dba_reconnect
DBA::(re-)connect fix for basePath
2019-02-23 08:45:31 -05:00
1a0398a5b3
Merge pull request #6723 from nupplaphil/issue/6658-worker_id
Adding worker ID to log
2019-02-23 08:38:08 -05:00
5f17ce574f
Fixing DBA::(re-)connect() 2019-02-23 12:50:52 +01:00
a73235b6ee
Fixing DBA::(re-)connect() 2019-02-23 12:49:56 +01:00
c53f0a4382
Fixing DBA::reconnect() 2019-02-23 12:48:39 +01:00
8760d89eb8
reverting back workerLogger to Logger 2019-02-23 10:24:22 +01:00
5b2f394e3e
Fixing #issuecomment-456403983 2019-02-23 10:16:07 +01:00
c1896eee34
Merge pull request #6725 from nupplaphil/6691-rendertime-fix
Addon loading fix
2019-02-22 23:53:11 -05:00
3aae84edd1
[rendertime] Timing problem during addon config read 2019-02-23 01:24:08 +01:00
40e9bbeb88
cleanup 2019-02-23 00:53:31 +01:00
13807129aa
fixing preload adapter 2019-02-23 00:23:41 +01:00
1dee89f215
fixing tests and preload config 2019-02-23 00:09:57 +01:00
8d56fb8fbe
bugfix marking of db-values 2019-02-22 23:57:04 +01:00
b47fc97b06
readded note 2019-02-22 23:55:13 +01:00
16863c5d82
switched back to logger 2019-02-22 23:53:20 +01:00
8c3aebc376
Bugfixings in Config
- replaced usage of "!<unset>!" with null-returns
- fixed bool settings (0/1)
- fixed overriding config-values
- fixed basepath problems
2019-02-22 23:51:13 +01:00
a613523dd7
skip WorkerLogger for Logging 2019-02-22 20:45:13 +01:00
9c12f3f226
Formatting logger to new style 2019-02-22 20:41:13 +01:00
cec6f49023
Removed unused code 2019-02-22 20:24:10 +01:00
ee37632695
Adding worker id & functionname to worker logs 2019-02-22 20:10:27 +01:00
2d91d5c3d9
Merge pull request #6717 from annando/network-mentions
Automatically adding mentions in the network stream hadn't really worked
2019-02-21 21:14:23 -05:00
4375edd63e
Merge pull request #6719 from annando/worker-scheduler
New scheduler mechanism - now to the correct branch
2019-02-21 16:12:19 -05:00
08d92d7ad8 Automatically adding mentions in the network stream hadn't really worked 2019-02-21 20:42:00 +00:00
7810227040 Reverted test stuff 2019-02-21 19:34:12 +00:00
3450f12cba Changed log calls 2019-02-21 19:32:31 +00:00
73cafb5b11
Merge pull request #6709 from annando/urlpath
Issue 6679: Quick fix
2019-02-20 16:40:06 -05:00
886da50474 Issue 6679: Quick fix 2019-02-20 21:06:52 +00:00
466f7a0ee5
adding test 2019-02-20 17:20:17 +01:00
107293bd61
Fixing rendertime 2019-02-20 17:12:40 +01:00
1df19d3553
Merge pull request #6697 from annando/memory-jsonld
Avoid memory issue in exception of JSON-LD parser
2019-02-19 09:40:01 +01:00
4facd1dfdb Avoid memory issue in exception 2019-02-19 07:49:27 +00:00
9fa812b35d
Rewrites:
- converted single-line if() block to multi-line and with curly braces
- "imported" SPL classes to have unified code style
- always initialize your variables ... :-/
- added some empty lines/spaces for better readability

Signed-off-by: Roland Häder <roland@mxchange.org>
2019-02-19 01:56:41 +01:00
c2176aad36
bugfix 2019-02-18 14:45:24 +01:00
5127a113aa
set config_loaded with uid 2019-02-18 14:40:35 +01:00
1194e9b41e
set config_loaded with uid 2019-02-18 14:34:30 +01:00
5157084969
negative set 2019-02-18 14:10:04 +01:00
2fc81898da
Preload Adapter Fix 2019-02-18 14:02:09 +01:00
f536107911
Fixing value check for configuration 2019-02-18 11:29:51 +01:00
86aaa6565e
Fixing saveLog() 2019-02-18 11:29:51 +01:00
a3d6062476
check if value is set
get basepath with config instead cache
2019-02-18 11:29:42 +01:00
74edf9994f
Merge pull request #6678 from rabuzarus/20190217_-_fix_magicLinks_mentions
fix magic links for item mentions
2019-02-17 21:24:01 -05:00
95deff1685
use cache for basepath 2019-02-18 01:15:55 +01:00
218e41a818
Bugfixing index.php 2019-02-18 00:53:00 +01:00
256e845c5d
Merge pull request #6641 from nupplaphil/config_followup
Config FollowUp
2019-02-17 17:56:31 -05:00
5e5c39b0e1
Refactored DependencyFactory for Profiler 2019-02-17 21:12:12 +01:00
cdcf1667d7
Adding DependencyFactory 2019-02-17 20:45:39 +01:00
0a318925a4
bugfixing adapter get() in case of no connection 2019-02-17 20:44:14 +01:00
ad1254c49c
performance improvement in case of db-load 2019-02-17 20:44:14 +01:00
e1d9d67632
renamed Logger::setLogger() to Logger::init() 2019-02-17 20:44:08 +01:00
80f1feabe5
Refactoring Logging to use Configuration 2019-02-17 20:43:52 +01:00
eafcf3592d
Config FollowUp
- New Configuration (Config is now only holding the instance)
- New PConfiguration (PConfig is now only holding the instance)

- Config & PConfig-Adapter don't need "ConfigCache" anymore

- DB-Connection is now outside App->reload() for better dependency-chaining
2019-02-17 20:40:27 +01:00
a1a1367d6e Added function description 2019-02-17 19:20:24 +00:00
061d959e7f Code cleanup 2019-02-17 18:55:17 +00:00
rabuzarus
c59ba94648 fix magic links for item mentions 2019-02-17 17:19:57 +01:00
rabuzarus
9ebb2f42a1
Merge pull request #6660 from MrPetovan/task/6552-frio-improve-thread-display
[frio] Improve thread display
2019-02-17 13:33:49 +01:00
c36a0eabdb
fixing reset() 2019-02-17 10:34:48 +01:00
01d6ba85ff The number of workers per priority is now calculated dynamically 2019-02-17 03:22:29 +00:00
d87a6e5a67
fixed line intends 2019-02-17 02:09:39 +01:00
3d07774509
removed wrong log-output 2019-02-17 01:57:59 +01:00
a3b9a8fe61
Excluding Profiler from Loglines (better using the class above) 2019-02-17 01:56:46 +01:00
88fd871844
refactoring & test fixing 2019-02-17 01:18:21 +01:00
6d73dcbe3d
Adding composer & tests 2019-02-17 00:03:38 +01:00
0a7861da65
Dependency of callstack moved one layer up 2019-02-16 23:17:10 +01:00
5e6e1a8025
Introducing Profiler 2019-02-16 23:11:30 +01:00
11a7f97fe7
friendica-6667 Installer needs to check fileinfo module 2019-02-16 22:17:34 +01:00
0845089a0f New scheduler mechanism 2019-02-16 15:03:37 +00:00
d7dbc632f8 Improved comment hiding interaction
- Remove global window.showMore and window.showFewer
- Improve global showHideComments function
- Remove frio-specific showHideComments function
2019-02-14 22:24:34 -05:00
b321ef776d
added type-hint 2019-02-14 17:54:34 +01:00
347d959f25
fixing #6652 Manual installer bricked 2019-02-14 17:44:17 +01:00
fe57583e2b
Merge pull request #6655 from annando/worker-limit
Worker: Changed behaviour of "worker_fetch_limit" config value
2019-02-14 08:45:19 -05:00
ca529d9de7 The process id is currently not supported. 2019-02-14 13:30:41 +00:00
e20a675953 The setting "worker_fetch_limit" now only has an impact on high priority processes 2019-02-14 06:53:04 +00:00
ca7ceb6fe2 We should return something ;-) 2019-02-13 17:26:54 +00:00
d4baa25349 New configuration to disable the automatic mentions removal 2019-02-13 17:23:23 +00:00
Michael Vogel
a29b6f17e2
Merge pull request #6649 from MrPetovan/bug/6647-include-newlines-in-implicit-mention-regex
Include new lines in implicit mention regular expression
2019-02-13 18:16:47 +01:00
63f083f6fb Include new lines in implicit mention regular expression 2019-02-13 08:08:46 -05:00
73ecf2100e Indentions 2019-02-13 10:22:36 +00:00
44ac0275ab Issue 6603: Events are now fetchable via AP 2019-02-13 07:17:19 +00:00
e9045dbe09
Merge pull request #6646 from annando/fix-loxk
Should fix "DB Error 1205: Lock wait timeout exceeded"
2019-02-12 16:26:27 -05:00
8cb2ab2a90 Should fix "DB Error 1205: Lock wait timeout exceeded; try restarting transaction" 2019-02-12 21:10:45 +00:00
f6e8246e75 Ensure that "strtotime" returns the correct timestamp 2019-02-12 06:42:45 +00:00
5cf5f33a1c
Merge pull request #6640 from annando/worker-stats
Fix worker statistics
2019-02-11 22:00:55 -05:00
742b472994 Fix: Workerqueue processes had been killed too early 2019-02-11 22:39:59 +00:00
6fd8b5f365 Don't send single item delete commands to protocols that support account removal 2019-02-11 20:30:08 +00:00
d6a82c6c2d
Merge pull request #6638 from Ixiter/develop-markdown-anchors
ACL network - fixed preselected acl items
2019-02-11 07:23:32 -05:00
Peter Liebetrau
3dede5dbd2 ACL network - fixed preselected acl items 2019-02-11 10:00:42 +01:00
f65b35901e Fix worker statistics 2019-02-11 08:59:14 +00:00
5fc6c0ef38 Fix: Corected config value name 2019-02-11 04:39:24 +00:00