Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-25 06:40:17 +00:00
Code Issues Projects Releases Packages Wiki Activity
23318 commits 3 branches 64 tags 237 MiB
Commit graph

3164 commits

Author SHA1 Message Date
Michael
cec094c5b1 Centralise the item content processing in a single function 2019-03-17 13:50:14 +00:00
Hypolite Petovan
f9e4f2a132
Merge pull request #6894 from annando/fix-summary 
Summary has to be converted to HTML / Don't use summary when we have the source
 2019-03-17 09:11:29 -04:00
Hypolite Petovan
5ed48ba425
Merge pull request #6893 from nupplaphil/issue/fixing_htconfig 
Fixing .htconfig loading
 2019-03-17 07:36:39 -04:00
Philipp Holzer
b22ff7419e
refactor naming & superfluous check 2019-03-17 09:57:34 +01:00
Michael
0104da3c93 Summary has to be converted to HTML / Don't use summary when we have the source 2019-03-17 00:06:31 +00:00
Philipp Holzer
8c6e6b5dea
Fixing .htconfig 2019-03-16 20:31:10 +01:00
Philipp Holzer
1acd5c7d22
- Adding additional legacy .htconfig information 2019-03-16 20:06:53 +01:00
Michael
ce2e98ea68 Adding a line feed looks nicer 2019-03-16 11:18:36 +00:00
Michael
14b56ce0cc Adding the "abstract" element to the imported feed 2019-03-16 10:59:11 +00:00
Michael
dfcf1b1e6f We now send a summary via AP. This partially fixes the problem with Mastodon and Articles 2019-03-16 08:46:33 +00:00
Michael
4ff837488f Issue 6167: Don't publish non visible content 2019-03-15 20:31:07 +00:00
Michael
80c2c5479a Issue 6167: Don't distribute uploaded pictures 2019-03-15 06:05:52 +00:00
Michael
a60a440c9a Fix notice - it's "uri" not "url" 2019-03-14 21:55:18 +00:00
Hypolite Petovan
78271f0593
Merge pull request #6881 from annando/ap-forum 
Forums now are working with AP as well
 2019-03-14 17:42:49 -04:00
Michael
cd0d6cb626 Forums now are working with AP as well 2019-03-14 18:44:41 +00:00
Hypolite Petovan
ee4585ec71
Add inline spans to code block extraction in BBCode::convert 
- Fixes autolinker replacing URLs inside of code spans
 2019-03-14 09:03:31 -04:00
Hypolite Petovan
4cafe11d4d Swap attachment conversion and autolinking in BBCode::convert 
- Fixes a rare display bug where an attachment description ends with a text URL
 2019-03-13 23:13:10 -04:00
Philipp
c8331eb068
Merge pull request #6857 from friendica/MrPetovan-patch-autolinker-domain 
Remove new lines from domain name part of autolinker regular expression in Util\Strings
 2019-03-13 07:05:52 +01:00
Tobias Diekershoff
add0b1077e
Merge pull request #6858 from nupplaphil/issue/6788-multiple_notifies 
Avoid double updates
 2019-03-12 07:24:32 +01:00
Michael
4b98200315 Added logging 2019-03-12 05:45:02 +00:00
Michael
997b98e345 Fix for falsely detected AP profile in case of timeout 2019-03-12 05:21:04 +00:00
Philipp Holzer
cf17c72fd7
Adapt Logging messages 2019-03-11 21:36:41 +01:00
Philipp Holzer
8a358d5c98
Add Logger entry 2019-03-11 21:27:36 +01:00
Philipp Holzer
9a60eab152
Skip update if already done 2019-03-11 21:21:01 +01:00
Hypolite Petovan
8f96e383a7
Remove new lines from domain name part of autolinker regular expression in Util\Strings 
- Fixes issue where the autolinker would include the next paragraph is a pathless URL was followed by new lines.
 2019-03-11 14:37:56 -04:00
Philipp
6f3359cbcd
Merge pull request #6851 from annando/fix-mentions-again 
Fix mentions - again
 2019-03-11 08:21:32 +01:00
Michael
694cf50509 Fix mentions - again 2019-03-11 06:41:48 +00:00
Hypolite Petovan
579d42a215 Fix fatal error when using Logger::devLog 
- Error message is "Call to a member function log() on null in src/Core/Logger.php:304"
 2019-03-10 22:19:12 -04:00
Philipp
7b91c26c31
Merge pull request #6849 from annando/followup-6834 
Follow up to 6834: Don't store item when the server is blocked
 2019-03-10 23:31:59 +01:00
Michael
35ff932613 Follow up to 6834: Don't store item when the server is blocked 2019-03-10 21:19:21 +00:00
Tobias Diekershoff
61fe82ad20
Merge pull request #6846 from annando/fix-mentions 
Fix for the automatic mentioning
 2019-03-10 07:03:31 +01:00
Michael
337a3bb1aa Fix for the automatic mentioning 2019-03-10 05:41:40 +00:00
Hypolite Petovan
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
Hypolite Petovan
184b51ec56 Move autolink regex in Util\Strings 2019-03-09 23:25:53 -05:00
Hypolite Petovan
ad854d5d40 Define absolute paths for various includes 
- Fix errors running local tests in IDE
 2019-03-09 23:21:19 -05:00
Hypolite Petovan
a2ec9e676e
Revert "Avoid double update runs" 2019-03-09 18:28:48 -05:00
Philipp Holzer
f7c7851c2d
replaced duplicate code with method 2019-03-09 20:50:06 +01:00
Philipp Holzer
20498d1d40
replaced duplicate code with method 2019-03-09 20:50:00 +01:00
Philipp Holzer
7047a13ffa
added phpdoc 2019-03-09 20:49:59 +01:00
Philipp Holzer
e46a7cdf80
Avoid double update runs 2019-03-09 20:49:59 +01:00
Hypolite Petovan
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
Hypolite Petovan
d0b2ed7966 Remove test code in ActivityPub\Processor 2019-03-09 09:04:43 -05:00
Hypolite Petovan
70782b3977 Fix implicit mention detection regular expression flags in ActivityPub\Processor 2019-03-09 09:04:11 -05:00
Philipp Holzer
50b7d95b2a
Set Timezone to 'UTC' for every Logger 2019-03-09 14:28:31 +01:00
Tobias Diekershoff
af77af0446
Merge pull request #6833 from MrPetovan/bug/notices 
Fix various notices
 2019-03-09 09:12:09 +01:00
Tobias Diekershoff
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
Hypolite Petovan
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
Hypolite Petovan
704cb052ca Add server block provision to Diaspora::postAllow 2019-03-08 22:40:08 -05:00
Hypolite Petovan
d40cbdce32 Remove unnecessary @throws tag in Util\Network 2019-03-08 22:39:08 -05:00
Hypolite Petovan
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
Hypolite Petovan
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
Michael
ea71a4e83a Refetch new jobs only once per execution loop 2019-03-08 20:39:58 +00:00
Tobias Diekershoff
5df246e9af
Merge pull request #6825 from annando/empty-spawn 
Worker: Don't spawn without jobs
 2019-03-08 07:26:22 +01:00
Michael
d87abe9563 Worker: Don't spawn without jobs 2019-03-08 05:53:36 +00:00
Tobias Diekershoff
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
Hypolite Petovan
77a591e6e3 Fix namespace ambiguity about Model\Queue in Worker\Delivery 2019-03-06 23:17:58 -05:00
Michael
e89d56be6d Improved contact update from probe 2019-03-07 00:13:39 +00:00
Philipp Holzer
07bd4cec65
Fixing redis cachekey 2019-03-04 21:28:36 +01:00
Philipp Holzer
d7426e697d
Fixing redis cachekey 2019-03-04 21:09:20 +01:00
Philipp Holzer
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
Hypolite Petovan
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
Hypolite Petovan
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
Michael
a911baf8e5 Avoid transmitting a deletion message when we don't have a key 2019-03-04 06:52:43 +00:00
Michael
888e2ce2a9 Added forgotten "use" 2019-03-03 07:05:57 +00:00
Michael
3237dab1a4 Added warning about an empty key 2019-03-03 07:01:11 +00:00
Michael
f2560c42d1 Reduce the default maximum load for the worker to 20 2019-03-02 18:41:12 +00:00
Michael
9427d7f628 We have to fetch the data this way 2019-03-02 13:07:29 +00:00
Michael
16c2ae89e8 Sent update mails to administrators only once 2019-03-02 12:57:47 +00:00
Philipp Holzer
16ff5af221
Fix handling table name during storage move 2019-03-01 18:07:08 +01:00
Tobias Diekershoff
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
Michael
0b2cdf5d26 Issue 6395: Don't log details to avoid memory issues 2019-02-28 09:07:24 +00:00
Hypolite Petovan
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
Hypolite Petovan
fb965f4d81
Merge pull request #6773 from nupplaphil/issue/6772-update_query_missmatch 
Update - query missmatch
 2019-02-27 15:22:42 -05:00
Philipp Holzer
739449926c
'%' is deprecated 2019-02-27 20:30:08 +01:00
Philipp Holzer
4a47425bfd
admin mail list seems wrong escaped 2019-02-27 20:17:35 +01:00
Philipp Holzer
2b53784094
Reuse existing Strings::getRandomHex function 2019-02-27 18:32:25 +01:00
Hypolite Petovan
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
Michael
c3b12b63c8 Added some description, changed logger call 2019-02-27 09:49:26 +00:00
Michael
505a34d40e Log the time as decimal 2019-02-27 09:12:40 +00:00
Michael
78960d4bde Removed unneeded spaces 2019-02-27 09:11:37 +00:00
Michael
5e440aa035 The cron interval is minutes - so we have to convert it into seconds 2019-02-27 08:55:25 +00:00
Michael
0ee1ea5f29 The log text is now shorter 2019-02-27 08:41:45 +00:00
Michael
11e39da6cc And moving the block back to the old place 2019-02-27 07:08:44 +00:00
Michael
e1cc7262de Respawing when quitting 2019-02-27 07:04:21 +00:00
Michael
528636c9f4 Using constants is nicer 2019-02-27 06:55:04 +00:00
Michael
fb371e1048 Merge remote-tracking branch 'upstream/2019.03-RC' into worker2 2019-02-27 06:41:14 +00:00
Michael
40573120b9 Enhanced logging, stopping worker after cron lifetime 2019-02-27 06:36:19 +00:00
Tobias Diekershoff
bd7aaacfb0 fixing links in photoMenu 2019-02-26 10:19:08 +01:00
Hypolite Petovan
97eb2ba053 Fix possibly undefined after index in Text\BBCode 2019-02-25 07:12:01 -05:00
Hypolite Petovan
05d8bf6b54 Fix wrong use of array_shift in Core\Worker 2019-02-25 07:11:35 -05:00
Hypolite Petovan
f597f3b378 Protect access to rel attribute in Network\Probe 2019-02-25 03:39:40 -05:00
Hypolite Petovan
3e290da8c2 Code standards: Add missing space in ActivityPub\Processor 2019-02-25 03:16:18 -05:00
Hypolite Petovan
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
Hypolite Petovan
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
Hypolite Petovan
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
Hypolite Petovan
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
Hypolite Petovan
82072bae46 Add missing use statement in Model\Term 2019-02-24 13:33:11 -05:00
Hypolite Petovan
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
Philipp Holzer
5d13b94761
update phpdoc 2019-02-24 16:31:16 +01:00
Philipp Holzer
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
Philipp Holzer
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
Philipp Holzer
e48c608db0
removed silent fail of logfile permission (should get fixed with #6745 ) 2019-02-24 13:57:17 +01:00
Philipp Holzer
5fc42a744e
Replace string namespaces with ::class 2019-02-24 13:40:54 +01:00
Hypolite Petovan
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
Philipp Holzer
d1c7815c4e
added whitespace 2019-02-24 12:51:58 +01:00
Philipp Holzer
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
Michael
4bad2645e5 We should execute the worker job for normal situations ;-) 2019-02-24 10:52:40 +00:00
Michael
ee300a7db6 Ensure that the database update will be processed anyway 2019-02-24 10:43:29 +00:00
Philipp Holzer
7ce549c294
fixing delete 2019-02-24 10:27:56 +01:00
Philipp Holzer
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
Hypolite Petovan
dbcca9cfac Hide "never" on profile 2019-02-23 18:37:51 -05:00
Hypolite Petovan
b2e41e3298 Replace EMPTY value by empty value in profile selectors 2019-02-23 18:37:48 -05:00
Hypolite Petovan
6376293218 Merge /contactgroup module with Group module 2019-02-23 17:32:40 -05:00
Hypolite Petovan
7ab986bc97 Move group module to src/ 2019-02-23 17:32:40 -05:00
Hypolite Petovan
b939faf4ef Add contact removal from all groups when blocked 2019-02-23 17:32:40 -05:00
Hypolite Petovan
7e499647e3 Add System::jsonError method for ajax call returns 2019-02-23 17:32:40 -05:00
Hypolite Petovan
f4745c5936 Add doc to Model\Term 2019-02-23 17:32:13 -05:00
Hypolite Petovan
67aa188830 Improve Logger calls 
- Add context in various calls
- Remove deprecated Logger::log call in Processor
 2019-02-23 17:32:13 -05:00
Hypolite Petovan
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
Hypolite Petovan
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
Hypolite Petovan
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
Hypolite Petovan
e51f2cea0d Add implicit mentions to explicit mentions default text 2019-02-23 17:32:12 -05:00
Hypolite Petovan
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
Hypolite Petovan
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
Hypolite Petovan
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
Hypolite Petovan
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
Hypolite Petovan
cd53585101 Improve /itemsource display 
- Add Item Id
- Add Item Terms
 2019-02-23 17:32:10 -05:00
Hypolite Petovan
7320c5e8e8 Normalize Contact::magicLinkByContact method name 2019-02-23 17:32:10 -05:00
Michael
ed54345ce1 Only check once 2019-02-23 22:27:03 +00:00
Michael
28f7c72cc7 Don't allow calling the install page after the install had been processed 2019-02-23 21:58:35 +00:00
Michael
7703875b55 Fixes "Undefined property: Friendica\App::$queue" 2019-02-23 16:08:02 +00:00
Hypolite Petovan
44953f045e
Merge pull request #6730 from nupplaphil/dba_reconnect 
DBA::(re-)connect fix for basePath
 2019-02-23 08:45:31 -05:00
Hypolite Petovan
1a0398a5b3
Merge pull request #6723 from nupplaphil/issue/6658-worker_id 
Adding worker ID to log
 2019-02-23 08:38:08 -05:00
Philipp Holzer
5f17ce574f
Fixing DBA::(re-)connect() 2019-02-23 12:50:52 +01:00
Philipp Holzer
a73235b6ee
Fixing DBA::(re-)connect() 2019-02-23 12:49:56 +01:00
Philipp Holzer
c53f0a4382
Fixing DBA::reconnect() 2019-02-23 12:48:39 +01:00
Philipp Holzer
8760d89eb8
reverting back workerLogger to Logger 2019-02-23 10:24:22 +01:00
Philipp Holzer
5b2f394e3e
Fixing #issuecomment-456403983 2019-02-23 10:16:07 +01:00
Hypolite Petovan
c1896eee34
Merge pull request #6725 from nupplaphil/6691-rendertime-fix 
Addon loading fix
 2019-02-22 23:53:11 -05:00