Commit graph

5839 commits

Author SHA1 Message Date
rabuzarus
dcbf4d6d11 fix event html construction (fixes #2646) 2017-10-13 20:03:47 +02:00
rabuzarus
553428d1b1 event items are now more themeable in the networkstream.
The event description stays the same - but the theme developer can provide an template how the other event data should be organized and look
2017-10-13 19:42:27 +02:00
Michael
e091a610d7 Fixed indention level 2017-10-13 16:24:38 +00:00
Michael
b31c6413fe Can be private 2017-10-13 15:51:57 +00:00
Michael
9f2196aa1a Parameter should fit ... 2017-10-13 15:48:59 +00:00
Michael
0a45f40c9d Diaspora: We now support the receiving of account migration messages 2017-10-13 15:32:10 +00:00
rabuzarus
0882b2df97 Merge pull request #3779 from annando/event-data
export event data for display purposes
2017-10-13 13:06:46 +02:00
Michael
b31b29c557 Now it could work 2017-10-13 09:41:01 +00:00
Michael
2b80bf4683 Improved documentation 2017-10-13 09:26:07 +00:00
Michael
09020192d6 Diaspora: Support account migration 2017-10-13 09:22:05 +00:00
Michael
eeec1ea163 We should take the event-id as well 2017-10-11 20:45:03 +00:00
Michael
42a76bced9 export event data for display purposes 2017-10-11 19:51:18 +00:00
Michael
225eea2ca6 Avoid undefined class variables 2017-10-11 14:52:08 +00:00
Michael
a29b7e7153 "dba" is now a static class 2017-10-11 12:56:36 +00:00
Michael
dbcd1d1ae3 Additional check if the database object is initialized 2017-10-10 22:25:38 +00:00
Michael
63e02eb57f Checks if the database variable is initialized 2017-10-10 22:18:57 +00:00
Michael
763838c78d OStatus: Better handling of changed nicknames 2017-10-10 09:13:37 +00:00
Tobias Diekershoff
4c75c59039 Merge pull request #3772 from annando/relocate-ignore
Process "relocate" messages even if we are ignoring a contact
2017-10-09 05:16:32 +00:00
Michael
09af73168c Process "relocate" messages even if we are ignoring a contact 2017-10-09 05:02:50 +00:00
Tobias Diekershoff
495b639e55 .com -> .ca 2017-10-08 10:22:29 +02:00
Michael
5d0e7d24ba When showing posts for a contact we have to tread forums in a special way 2017-10-08 05:20:09 +00:00
Michael
67e57a83df Feeds are now trimmed before importing 2017-10-07 18:35:10 +00:00
Michael
c6dbbe21b4 Preparation for the possibility to globally block contacts 2017-10-07 09:52:43 +00:00
Michael
ceb0dda486 Fixes the not changed "addr" entry when an account is imported 2017-10-07 05:20:46 +00:00
Michael
1870f942d3 Fix SQL error when changing the SSL paths 2017-10-06 19:25:04 +00:00
Tobias Diekershoff
071946fa78 Revert "Update languagedetect library" 2017-10-05 11:58:18 +02:00
Tobias Diekershoff
c22920edba Merge pull request #3743 from MrPetovan/task/update-languagedetect
Update languagedetect library
2017-10-05 08:49:17 +00:00
Michael
a8a7f4a76d Better handling of blocked contacts in OStatus 2017-10-03 20:52:24 +00:00
Michael
c33aa2ccee Diaspora: Reshares of reshares sometimes had problems 2017-10-02 19:00:33 +00:00
Michael
fffc360c6a Detect the hostname when the URI is in the format data@host.tld 2017-09-30 21:39:32 +00:00
Michael
3354f01ed5 Doxygen and bugfix 2017-09-30 17:42:03 +00:00
Michael
2971501f63 The direct structure call is now only executed when called via the poller.php 2017-09-30 17:12:27 +00:00
Michael
bd88179419 Add additional checks for the worker 2017-09-30 11:19:46 +00:00
Michael
42a8f27034 Semaphore lock deactivated for PHP lower 5.6.1 2017-09-30 07:51:09 +00:00
Michael
98a3e012f8 Reliably show posts from contact 2017-09-28 06:01:31 +00:00
Hypolite Petovan
ba1975ac3a Remove references to the library/langdet folder 2017-09-27 22:40:58 -04:00
Michael
8d95106b9d XML parsing is more tolerant now 2017-09-25 21:34:44 +00:00
Michael
03c9e22334 Poller: A limit of 1 seems to be better 2017-09-25 19:33:41 +00:00
Michael
1aafb80743 Added log information 2017-09-25 06:04:40 +00:00
Michael
66515ed85e Diaspora: Posts from Diaspora relais are transmitted the old way 2017-09-25 04:24:47 +00:00
Michael
9d7ab9d941 OStatus: Thread completition hadn't worked for (some) Mastodon systems 2017-09-24 15:31:09 +00:00
Tobias Diekershoff
bcdccac39c Merge pull request #3729 from annando/plaintext-again
And another plaintext correction :)
2017-09-24 16:00:39 +02:00
Michael
2b3bc54049 And another plaintext correction :) 2017-09-24 13:47:31 +00:00
Michael
ff6f937f2b Author check works now 2017-09-24 13:27:35 +00:00
Michael
80d787d990 Bugfix: Diaspora retractions not always worked 2017-09-24 12:02:32 +00:00
Tobias Diekershoff
e6f80b3bc1 Merge pull request #3726 from annando/plaintext
Improved type detection
2017-09-24 09:48:36 +02:00
Michael
17f2928535 Improved type detection 2017-09-24 06:36:03 +00:00
Tobias Diekershoff
d6d1ee9112 Merge pull request #3724 from annando/plaintext
Better content detection for posts to Twitter
2017-09-24 07:23:47 +02:00
Michael
fc1bfe043b The "else" case was only confusing 2017-09-23 23:15:04 +00:00
Michael
d72e6b2c82 Bugfix for better mail import 2017-09-23 22:53:44 +00:00
Michael
aeb6e53d02 Better content detection for posts to Twitter 2017-09-23 20:13:09 +00:00
Tobias Diekershoff
7360945d8a Merge pull request #3722 from annando/diaspora-plink
The plink in Diaspora posts now links to the correct place
2017-09-23 17:41:57 +02:00
Michael
8983dcaa77 Improvements for following/unfollowing of Diaspora and OStatus 2017-09-23 14:48:27 +00:00
Michael
e8a2c68647 The plink in Diaspora posts now links to the correct place 2017-09-23 08:52:06 +00:00
Michael
cb5b155083 Bugfix: The API picture upload created an invalid link 2017-09-20 21:47:12 +00:00
Tobias Diekershoff
3e8dc38180 Merge pull request #3716 from annando/bugfix-mail
Bugfix: Mails weren't created
2017-09-19 15:10:22 +02:00
Michael
fdc010bb1b Bugfix: Mails weren't created 2017-09-19 12:59:24 +00:00
Michael
b79c3241c6 Directly serve atom+xml if requested 2017-09-19 11:53:19 +00:00
Michael
5ed24954f0 Bugfix: Pleroma was detected as Mastodon 2017-09-18 06:09:18 +00:00
Michael
926314a24c gcontact is now updated with the new database functions as well 2017-09-17 08:13:10 +00:00
Michael
8d4736c942 OStatus: We can now process delete messages / better account detection 2017-09-17 08:01:22 +00:00
Tobias Diekershoff
af44e96fc9 Merge pull request #3710 from annando/diaspora-retraction
Diaspora: Sending retractions only worked for posts
2017-09-16 21:24:50 +02:00
Michael
ef8ad9f1ed Diaspora: Sending retractions only worked for posts - nor for comments or likes 2017-09-16 18:23:24 +00:00
Michael
0982a30c89 Improvement for PR 3705: The detection has to be changed here as well 2017-09-16 17:22:22 +00:00
Michael
0eb92bf12a Unused functions removed 2017-09-16 05:09:14 +00:00
Michael
dfd48dd6f6 "qu" is no more 2017-09-15 21:00:39 +00:00
Michael
6d7ececc42 Bugfix for pictures that weren't stored / reworked database calls 2017-09-15 19:41:30 +00:00
Tobias Diekershoff
0384e875a2 Merge pull request #3702 from annando/new-dba
The old database function is now replaced with a wrapper
2017-09-15 08:31:25 +02:00
Michael
f8d34e35e7 "exists", "select" whre is the difference? 2017-09-15 06:15:25 +00:00
Michael
88ada98245 Added documentation 2017-09-15 06:07:34 +00:00
Tobias Diekershoff
ad3566aeaa Merge pull request #3704 from annando/ostatus-improved
OStatus: Only fetch items that don't exist in the system
2017-09-15 07:18:14 +02:00
Michael
cf90e3571f Merge remote-tracking branch 'upstream/develop' into new-dba 2017-09-15 03:17:40 +00:00
Michael
cd16155c96 Only warn when there are arguments at all 2017-09-15 03:10:04 +00:00
Michael
f29e21eb5c We now avoid prepared statements without an argument 2017-09-15 03:00:38 +00:00
Michael
d10eaefaa9 Improved regular expression for the Diaspora link detection 2017-09-14 22:04:37 +00:00
Michael
87fffde80e Documented some unknown verbs 2017-09-14 20:40:05 +00:00
Michael
9dfb9c1c45 Only fetch items that don't exist in the system 2017-09-14 19:23:14 +00:00
Michael
9468b7427d Allow replies as well 2017-09-14 10:00:45 +00:00
Tobias Diekershoff
641e41067e Merge pull request #3701 from annando/issue-3700
Issue 3700: Security and Privacy related Headers
2017-09-14 10:28:03 +02:00
Michael
4b99d122dd Added explanation 2017-09-14 05:48:43 +00:00
Michael
7a3bb02f11 Issue 3700: Security and Privacy related Headers 2017-09-14 05:40:23 +00:00
Michael
c6ceae5225 The old database function is now replaced with a wrapper 2017-09-14 05:19:05 +00:00
Michael
e18a037fb2 API: Improvements for clients with bad HTML support 2017-09-14 05:16:23 +00:00
Michael
519a8807f1 Added documentation 2017-09-11 22:15:16 +00:00
Michael
ec929d8207 Fetch the own single post if we are processing a feed of multiple entries 2017-09-11 12:44:37 +00:00
Michael
8e17be7225 Store conversation data 2017-09-10 21:56:05 +00:00
Michael
b847f63e2a Added logging 2017-09-10 08:27:24 +00:00
Michael
bdf490e2fa Added missing function 2017-09-10 07:58:14 +00:00
Michael
21a630ebae Added documentation 2017-09-10 07:52:07 +00:00
Michael
746169eabf Improve comparabilty 2017-09-10 07:29:24 +00:00
Michael
c98c157efe Only some tabs 2017-09-10 07:23:14 +00:00
Michael
4b403e4fe2 OStatus: Reworked import 2017-09-10 07:21:23 +00:00
Michael
52b12fccc9 OStatus: Attached pictures now show up in repeated posts as well. 2017-09-09 07:43:50 +00:00
Michael
637eb0bfb4 Bugfix: Mails weren't sent 2017-09-08 15:14:33 +00:00
Michael
c44448dd57 We should reset the session variable 2017-09-08 08:50:08 +00:00
Michael
a5a4f53287 This is a better place 2017-09-08 07:08:06 +00:00
Michael
3c6d83acd9 Remote self should now finally trigger all addons 2017-09-08 07:00:38 +00:00
Michael
6e196a6afd Diaspora will introduce "like on comment" so we doing it as well 2017-09-08 05:36:00 +00:00
Michael
c3eaf336dc Removed code 2017-09-07 15:48:25 +00:00
Michael
6e670df80f OStatus: Better attachment handling for pictures 2017-09-07 15:34:50 +00:00
Michael
66968efb9a Logger date format is now ISO8601 compatible 2017-09-06 21:13:06 +00:00
Michael
c35a43bcb8 "remote-self" hadn't worked well with addons 2017-09-06 06:02:26 +00:00
Michael
cb8581b29a Support for server independant Diaspora style links 2017-09-06 04:55:36 +00:00
Tobias Diekershoff
65f1bcb780 Merge pull request #3673 from annando/contact-updating
Better updating of contacts
2017-08-30 22:34:01 +02:00
Michael
1cc50a80f4 Only update if there is a change 2017-08-30 19:33:16 +00:00
Michael
0083c16e87 Better updating of contacts 2017-08-30 18:05:41 +00:00
Michael
dbaed91a75 Bugfix: Repeating of posts generated a SQL error 2017-08-30 17:55:23 +00:00
Michael
1893c3df16 Pleroma-Servers are now detected and displayed in the statistics 2017-08-29 16:40:08 +00:00
Michael
83ce42172b Don't add "redir" links on mentions 2017-08-27 09:56:41 +00:00
Michael
12ae59dba3 No linefeeds 2017-08-27 07:12:27 +00:00
Michael
d8acb62ba6 Small formatting issue 2017-08-27 07:02:44 +00:00
Michael
a36c8a0173 Possibly Issue 3611: Better feed handling when there is no body 2017-08-27 06:59:07 +00:00
Michael
a729519de9 And some more static warnings removed 2017-08-26 10:01:50 +00:00
Michael
c382f9f3d7 Some more 2017-08-26 07:52:49 +00:00
Michael
5adfeb0bd5 App::get_baseurl is now replaced with System::baseUrl 2017-08-26 07:32:10 +00:00
Michael
3c24bed412 New class "System" 2017-08-26 06:04:21 +00:00
Michael
b0c26921ad Statically used methods should be defined statically as well 2017-08-25 15:56:08 +00:00
Tobias Diekershoff
959d6ae15e Merge pull request #3654 from annando/externalpubsubhubbub
Removed external pubsubhubbub URL
2017-08-25 09:47:58 +02:00
Michael
5c53544118 Removed external pubsubhubbub URL 2017-08-25 02:58:38 +00:00
Michael
2ecd5a55b7 Bugfix for "1" instead of "connect" 2017-08-24 19:11:27 +00:00
Tobias Diekershoff
417ea99ba5 Merge pull request #3650 from annando/feed-probing
Probing sometimes failed / problems with some web servers
2017-08-24 10:16:24 +02:00
Michael
c09c806f78 Probing sometimes failed / problems with some web servers 2017-08-24 07:56:46 +00:00
Michael
ba52dd9fa7 Merge remote-tracking branch 'upstream/develop' into pleroma2 2017-08-24 06:26:58 +00:00
Michael
6998897a34 Limit the number of feed entries (Can solve resub problems) 2017-08-23 23:01:37 +00:00
Michael
e533572ca3 Issue 3645: Avoid problems with boolean values 2017-08-23 19:40:42 +00:00
Michael
b378f5fb01 The "hub" url now contains the nickname 2017-08-23 05:01:15 +00:00
Michael
51dca9b034 Compatibility with pleroma added 2017-08-21 20:21:04 +00:00
Michael
85c49060e2 Preparation for Unicode Emojis 2017-08-20 19:47:00 +00:00
Michael
17b05c9ad9 Hash tag links now do a redir 2017-08-19 09:22:50 +00:00
Michael
f8946c9e0a When "local_search" is activated, then point all hashtags to the local server 2017-08-18 22:12:40 +00:00
Michael
e10bb40e1a Added logging 2017-08-16 04:53:15 +00:00
Michael
791fc1d8b3 DFRN: Improved delivery status handling 2017-08-16 04:08:57 +00:00
Michael
6c9953809a Improved position of "close" 2017-08-15 10:10:09 +00:00
Michael
a0567d4081 dbm::is_result now checks whether a dba:... call returns at least one result 2017-08-15 06:08:26 +00:00
Tobias Diekershoff
d2b7a44299 Merge pull request #3631 from annando/1708-libertree
Shared posts to Libertree now look better.
2017-08-15 07:44:53 +02:00
Michael
3290ccc779 Now some more stuff is fixed 2017-08-14 21:46:58 +00:00
Michael
4f6f47f714 Now the bugfix really should work 2017-08-14 20:58:02 +00:00
Michael
2d99e86b12 Bugfix for PR 3630: "get_contact_details_by_url" not always returned a value 2017-08-14 20:17:17 +00:00
Michael
3c59eefa22 Shared posts to Libertree now look better. 2017-08-14 19:16:28 +00:00
Michael
796cee6273 Cleaning code 2017-08-14 05:52:36 +00:00
Michael
1fa82581b6 Avoid warning 2017-08-14 05:47:25 +00:00
Michael
217a8ce6ee Events now work again 2017-08-14 05:05:32 +00:00
Michael
0ac725dc47 Some more updated queries 2017-08-12 22:15:16 +00:00
Michael
41a81624a2 Now deletions will also work with complicated queries 2017-08-12 18:07:47 +00:00
Michael
89017d4e6c DBA: The condition can now be a complex string 2017-08-12 13:54:29 +00:00
Michael
1d8c91c478 Restructured "dba::exists" function 2017-08-12 08:55:50 +00:00
Michael
b14b44e8a8 Merge remote-tracking branch 'upstream/develop' into dba-2 2017-08-12 07:37:06 +00:00
Michael
51f6c46923 Issue 3616: Don't create notifications for forum accounts 2017-08-12 05:08:45 +00:00
Michael
4ada71081f No timeout problem anymore in preview. 2017-08-11 20:25:02 +00:00
Michael
556cc0cc4c And some more changed lines 2017-08-11 19:26:08 +00:00
Michael
99f0c01cdd Some more changed queries 2017-08-11 16:21:55 +00:00
Michael
d810b21f87 New dba functions 2017-08-11 08:04:01 +00:00
Michael
7b6664f0f7 Improved parameter handling 2017-08-10 12:38:32 +00:00
Michael
33b61ab262 Database connections should be closed 2017-08-10 06:33:24 +00:00
Michael
eb7cbb9ada Now there are fewer than 300 updates left ... 2017-08-10 05:07:23 +00:00
Michael
bd8efb7f92 Several updates are transformed as well 2017-08-10 04:31:46 +00:00
Michael
03b86d3766 Now we have less than 100 insert commands, yeah 2017-08-09 23:02:57 +00:00
Michael
c6b04aa922 And some more inserts 2017-08-09 22:23:46 +00:00
Michael
6180d62ebc Some more inserts 2017-08-09 22:04:00 +00:00
Michael
f248f9cc85 Merge remote-tracking branch 'upstream/develop' into new-dba 2017-08-09 21:42:51 +00:00
Michael
fce72cbbc8 Modifed "update" and "insert" function / many changed queries 2017-08-09 21:12:41 +00:00
Michael
b01ab3e64c DBA: Do a fallback to other db functions on problems 2017-08-09 06:02:48 +00:00
Tobias Diekershoff
4d77c8a90a Merge pull request #3618 from annando/mysqli-fix
Quickfix for MYSQLi (prepared statement problem)
2017-08-08 09:32:26 +02:00
Michael
c3e1f88d4b Quickfix for MYSQLi (prepared statement problem) 2017-08-08 06:07:04 +00:00
Johannes Schwab
37262c24d9 Catch exceptions in PDO constructor 2017-08-04 11:01:29 +02:00
Tobias Diekershoff
93fb98959a Merge pull request #3613 from annando/some-ostatus
Speed up of OStatus transmission/Ignoring "created" with remote self
2017-08-03 08:01:04 +02:00
Michael
1bd85971a4 Avoid some PHP warnings, no functional changes 2017-08-03 05:50:44 +00:00
Michael
a80329b416 Speed up of OStatus transmission/Ignoring "created" with remote self 2017-08-03 05:42:44 +00:00
Michael
c98ae304c0 Endless scroll now avoids showing the same items 2017-07-31 06:04:37 +00:00
Michael
57b4ea4759 Bugfix: The ACL lookup had its problems after the last changes 2017-07-27 14:02:25 +00:00
Tobias Diekershoff
f3f42ae3a2 Merge pull request #3602 from annando/1707-expiration
Bugfix: the expiration check in item_store now works again
2017-07-23 22:21:30 +02:00
Michael
b266d7d6ff Bugfix: the expiration check in item_store now works again 2017-07-23 19:59:29 +00:00
Tobias Diekershoff
152eec4f2f Merge pull request #3597 from annando/1707-acl-separator
In the acl there is now a separation between groups, forums and contacts
2017-07-23 10:27:40 +02:00
Michael
2e704d79eb In the acl there is now a separation between groups, forums and contacts 2017-07-23 06:49:31 +00:00
Michael
8d66909ba5 Check general expiration time at item storing as well 2017-07-23 05:51:55 +00:00
Michael Vogel
0f67d82d05 Update socgraph.php
Two little style changes
2017-07-21 19:36:13 +02:00
zotlabs
a583bda5fc reduce the number of network fetches for server detection of hubzilla/red systems from around 10 to maybe 5. Kind of wasteful to get hit on 10 non-existent endpoints every couple of minutes. 2017-07-19 17:56:40 -07:00
Michael
4a7ca0d44f Fix crash with expiration, false logger constant, no empty postings 2017-07-19 05:51:39 +00:00
Michael
a5baba84af Only show the attachment elements if there are one. 2017-07-17 19:49:58 +00:00
Michael
1c8e74edce Attachments now look fine. 2017-07-17 19:38:15 +00:00
Michael
f65d6531ca Merge remote-tracking branch 'upstream/develop' into 1706-ostatus-attach 2017-07-15 10:36:56 +00:00
Michael
2bad626be6 Bugfix: Signatures for likes hadn't been stored 2017-07-15 04:03:50 +00:00
Michael
b49a36f949 The attached image has now a class 2017-07-15 04:02:12 +00:00
Michael
181947f774 Merge remote-tracking branch 'upstream/develop' into 1706-ostatus-attach
Conflicts:
	include/text.php
2017-07-13 20:38:18 +00:00
Tobias Diekershoff
86934119b1 Merge pull request #3580 from annando/issue-3571-2
Reworked "get_contact"
2017-07-13 08:34:59 +02:00
Tobias Diekershoff
3334e0332d Merge pull request #3582 from annando/duplicate-error
Avoid duplicate database errors when storing the conversations
2017-07-13 08:30:20 +02:00
Michael
4c7a197f4b Avoid duplicate database errors when storing the conversations 2017-07-13 06:00:53 +00:00
Michael
beaa911bac Bugfix: Some special characters weren't converted correctly 2017-07-13 05:57:37 +00:00
Michael
568abd537a Fixed error reporting 2017-07-12 08:14:36 +00:00
Michael
69f20959ff Update existing contact records with data from probing 2017-07-12 06:07:22 +00:00
Michael
a47e1e13d7 Process all data that we can fetch via probing 2017-07-12 05:56:35 +00:00
Michael
35b3723c4a database logging now works for database errors 2017-07-11 19:14:49 +00:00
Michael
8ec7f1de56 Issue 3571: Reworked "get_contact" function 2017-07-11 18:32:35 +00:00
Tobias Diekershoff
81dedb3f92 Merge pull request #3577 from annando/2in1
Issue 3571 and Diaspora mail bugfix
2017-07-11 08:31:39 +02:00
Michael
363322ba78 Issue 3571 and Diaspora mail bugfix 2017-07-10 22:35:32 +00:00
Michael Vogel
ef3398f09a Merge pull request #3573 from irhen/issue-3529-fix-mega-age
fix big age
2017-07-10 18:43:05 +02:00
irhen
c6137ca0df is empty check 2017-07-10 14:17:06 +03:00
Tobias Diekershoff
6bbc1ac602 Merge pull request #3575 from annando/dfrn-update-copy
DFRN: Update the public item copy as well
2017-07-09 10:17:22 +02:00
Tobias Diekershoff
5921fd03e5 Merge pull request #3574 from annando/further-expire-split
Split the delete process into a separate expire process
2017-07-09 10:15:34 +02:00
Michael
9f92fddb00 DFRN: Update the public item copy as well 2017-07-09 04:29:35 +00:00