1
0
Fork 0
Commit graph

420 commits

Author SHA1 Message Date
d54c79a772
Replace old database queries with the new ones 2018-05-14 22:50:04 +02:00
11dcb31960
was a bit confusing for me or I was not sleeping to much ...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-05-14 22:50:02 +02:00
ce07c20130
PHP5 does not support native type-hints, except array + used dbm::is_result()
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-05-14 22:50:02 +02:00
6579396627
removed TODO, one day this all needs refacturizing ...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-05-14 22:50:02 +02:00
7526afcf13
Continued:
- converted multiple single-line comments into one multi-line comment (please
  stop abusing programming languages!)
- added more TODO tags for type-hints (upcoming rewrite)
- opps, one space was only fixed in develop branch, not in this PR branch

Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-05-14 22:50:02 +02:00
f5f1650b62
fixed comment and explained one
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-05-14 22:50:02 +02:00
1fcd4f52e7
old behaviour restored
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-05-14 22:50:01 +02:00
87bb934f8f
added curely branches + reverted back to old behaviour (may come back one day)
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-05-14 22:50:01 +02:00
116d0ee1e0
better comment added by @Hypolite
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-05-14 22:50:01 +02:00
e5c4b0203a
added more curly braces + a bit more usage of dbm::is_result()
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-14 22:50:00 +02:00
3bb5a416f8
Some corrections 2018-05-14 22:50:00 +02:00
8b775d48f9
Replace old database queries with the new ones 2018-05-14 22:50:00 +02:00
dd6fd32883
rewrote based on CR by @Annando, thank you. It is now clear to me.
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-14 22:49:59 +02:00
25fd270959
Continued:
- added spaces and curly braces
- added more TODOs as there really more to be done

Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-14 22:49:58 +02:00
fc4d1296e3
was a bit confusing for me or I was not sleeping to much ...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-05-14 22:49:57 +02:00
4d5c61395e
PHP5 does not support native type-hints, except array + used dbm::is_result()
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-05-14 22:49:57 +02:00
03f283ca36
fixed comment and explained one
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-05-14 22:49:56 +02:00
d2d6200669
old behaviour restored
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-05-14 22:49:56 +02:00
be3d0a90a5
added curely branches + reverted back to old behaviour (may come back one day)
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-05-14 22:49:56 +02:00
b823708c50
better comment added by @Hypolite
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-05-14 22:49:56 +02:00
Hypolite Petovan
f937dabc9e
Merge pull request #5044 from annando/no-feed-reshare
We mustn't reshare a feed item (only DFRN and Diaspora)
2018-05-13 18:31:58 -04:00
57bd073ffd We mustn't reshare a feed item (only DFRN and Diaspora) 2018-05-13 18:31:01 +00:00
99440f3c56
Beatification:
- added space after curly braces (MrPetovan)
- added TODO for possible rewrite candidate

Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-13 14:21:53 +02:00
Hypolite Petovan
ec626fb76c
Merge pull request #5036 from Alkarex/fix-constants
Fix wrong use of class constants
2018-05-13 04:38:32 -04:00
Alexandre Alapetite
736c76d068 Simplify constant names
https://github.com/friendica/friendica/pull/5036#discussion_r187792865
2018-05-13 10:34:33 +02:00
Alexandre Alapetite
41a8c62bee Fix wrong use of class constants
http://php.net/manual/language.oop5.constants.php
2018-05-13 10:07:15 +02:00
445cc1cb99
Fixes:
- brought back comment (ops)
- DBM is the class name (not dbm)

Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-13 10:06:43 +02:00
3191fee763
Ops, one to much ...
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-13 10:02:47 +02:00
926c9719e0 Avoid SQL error with empty "bd" field 2018-05-11 15:27:19 +00:00
79a343a69a Only set the "updated" value when it contains a value 2018-05-11 10:44:28 +00:00
6d4f3e8ee2 Issue 4997: Avoid database duplicates 2018-05-10 12:49:28 +00:00
cf9fa51f2f
Continued:
- added missing space/curly braces
- added TODOs for later adding a lot type-hints, without these (and they are
  long time around in PHP) anything can be handled over to the method/function.

Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-10 13:07:21 +02:00
f66cb9b0a3
added more curly braces + a bit more usage of dbm::is_result()
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-10 13:07:21 +02:00
40d3e7982c Adopt the relay definition according to the suggestions from @jaywink 2018-05-10 11:04:18 +00:00
Hypolite Petovan
3a3a4807a8
Merge pull request #4978 from annando/dba-2
Diaspora: Fix person/contact retraction
2018-05-04 18:04:38 -04:00
dfa0dbf33f Ups 2018-05-04 21:33:15 +00:00
1230ff146a "remote-self" is now working for Diaspora and Twitter as well 2018-05-04 21:12:13 +00:00
6dbf0de9f2 Removed activities that aren't in the Diaspora protocol 2018-05-04 06:34:02 +00:00
53b7028d35 Reshares had been detected falsely so that were rejected by Diaspora 2018-05-03 13:03:41 +00:00
eecd1e47e4 Some corrections 2018-05-02 21:12:48 +00:00
4ad655ab80 Replace old database queries with the new ones 2018-05-02 19:26:15 +00:00
1e0200884f Fixed private messaging/relaying is controlled by the parent 2018-05-01 06:37:12 +00:00
a182dd3400 Improved logging, avoiding PHP warning 2018-04-30 16:46:49 +00:00
d0dd5c44d9 Update or create relay contact from discovery / process new protocol values 2018-04-30 05:33:47 +00:00
Hypolite Petovan
bd21fc3751 Import posts from ignored contacts 2018-04-27 21:08:19 -04:00
6879be5168 Possibly not so important change ;-) 2018-04-27 14:21:12 +00:00
98415e0e34 Diaspora reshares should now always reshare the correct content 2018-04-27 14:03:10 +00:00
9f5a6c05fb Preparation for relay posts with DFRN 2018-04-27 05:11:52 +00:00
4957ab8fbb Avoid PHP warning with a missing key 2018-04-26 20:41:06 +00:00
ad45a73bf3 Improvements for the Diaspora protocol 2018-04-24 18:34:35 +00:00
5019d46071 We only need the uid 2018-04-24 14:58:39 +00:00
5cf745af44 Item distribution is now done via the public post 2018-04-24 13:21:25 +00:00
b3d24f0ff2 DFRN: mark for archival at different places 2018-04-23 06:03:55 +00:00
8f2db61538 Receiving of public posts is now working 2018-04-22 10:58:03 +00:00
c59b28a8c4 create public endpoint 2018-04-22 10:04:30 +00:00
Michael Vogel
39edd086e0
Merge pull request #4893 from MrPetovan/bug/4879-remove-backslash-in-birthday-events
Fix quoting style in DFRN::birthdayEvent()
2018-04-22 07:54:07 +02:00
Hypolite Petovan
851c5d841f Fix quoting style in DFRN::birthdayEvent() 2018-04-21 21:03:12 -04:00
16beab4652 Better working with private forums 2018-04-21 21:59:02 +00:00
fd7658a70a Contact requests from Diaspora for private forums aren't accepted automatically anymore 2018-04-21 10:39:46 +00:00
c507cdf946 Code simplified 2018-04-19 06:07:23 +00:00
da06416426 Merge remote-tracking branch 'upstream/develop' into dfrn-reshare 2018-04-19 05:44:06 +00:00
ed87e634ed Avoid duplicated multibyte tags 2018-04-18 05:00:28 +00:00
f99af007ae Replaced queries 2018-04-18 04:59:33 +00:00
88353ce56f Merge remote-tracking branch 'upstream/develop' into dfrn-reshare 2018-04-18 03:12:13 +00:00
6eba2ccd9b Forum posts now show the author when posted to Diaspora 2018-04-15 19:01:19 +00:00
4fd4d277f0 Store in lowercase to avoid duplicates 2018-04-12 08:55:36 +00:00
88eaef6704 Merge branch 'issue-4816' of github.com:annando/friendica into issue-4816 2018-04-11 19:21:23 +00:00
edcf1466a7 Relay: Avoid sending relay posts to servers that already received content 2018-04-11 19:01:25 +00:00
75f97db4ec Issue-4816: Avoid SQL errors / Unarchive living relais servers 2018-04-11 18:56:22 +00:00
869d8ab12d We can now define the days after a contact is archived 2018-04-10 11:10:02 +00:00
105f3ca747 Relay: Avoid empty tags / Always use the "relay account" 2018-04-09 05:53:23 +00:00
a75858f02c Don't queue relay posts 2018-04-08 09:46:47 +00:00
d0dfe2aa64 Fix: Empty answers in DFRN can be okay 2018-04-07 10:02:43 +00:00
c16ae0bacb Fix: Commenting on public posts from Friendica users is now possible again 2018-04-04 06:06:38 +00:00
1a2c771f24 DFRN: Improvements to delivery. Logging and marking as not reachable 2018-04-03 12:18:05 +00:00
d668b967c9 Misspelling 2018-04-02 22:06:31 +00:00
becc86a960 Changed logging text 2018-04-02 22:02:43 +00:00
8ff6a31512 Sending does now work 2018-04-02 21:59:30 +00:00
eeadd2f9d6 The Diaspora transport layer is now the default for DFRN 2018-04-02 21:46:10 +00:00
f89904ed77 Treatment, Treating, whatever :-) 2018-04-02 13:44:45 +00:00
0594f13c35 Receiving was tested, sending is implemented and tested as well, currently unused 2018-04-02 12:53:48 +00:00
f51a254ed0 Public contacts are not permitted for suggestions or mails 2018-04-01 05:07:35 +00:00
1613f2a1c4 Ensure that public contacts can't create toplevel posts 2018-03-30 06:20:00 +00:00
bfd057f148 Direct transfer without a relay is now possible 2018-03-28 04:24:38 +00:00
7868de529e Forgotten doxygen header 2018-03-27 15:12:19 +00:00
Hypolite Petovan
27155fead7
Merge pull request #4691 from annando/relais-discovery
Added server discovery for their relais configuration
2018-03-27 08:50:27 -04:00
bc03c8846c Fix sending messages to relay servers 2018-03-26 23:39:59 +00:00
00c444a699 Only update when changed 2018-03-26 06:17:50 +00:00
6b84cb9715 Only add tags in the "tags" scope 2018-03-26 06:11:55 +00:00
e65bd0325e Added server discovery for their relais configuration 2018-03-26 05:44:53 +00:00
Hypolite Petovan
09f04c1985 Add Image::getInfoFromURL return check 2018-03-24 20:03:55 -04:00
Hypolite Petovan
6e7c6ab0fa Remove references to include/event 2018-03-23 06:32:34 -04:00
Hypolite Petovan
f7e2071117 Replace include/event function with method calls
- Updated scope of Model\Event methods
- Updated use list
2018-03-23 06:32:34 -04:00
Hypolite Petovan
27d94023ee Merge branch 'master' into develop 2018-03-23 06:15:55 -04:00
73efdb99e3 Fix for incorrect datetime values 2018-03-21 05:20:55 +00:00
f4ba5d9799 Fix: Events on Diaspora now should look fine 2018-03-20 06:32:17 +00:00
d8824cc3bc Improved similarity to ostatus group feeds 2018-03-18 11:18:25 +00:00
3ff6520ed5 OStatus: Forum feeds now look like OStatus group feeds 2018-03-18 10:31:12 +00:00
9930c61263 Same same but different 2018-03-17 20:56:56 +00:00
c42c121e51 Fewer Defaults 2018-03-17 20:54:56 +00:00
8700d2a8ad Avoid storing "null" values 2018-03-17 13:09:21 +00:00
ec9b7af25b Fix: Private transmission via Diaspora to Friendica servers 2018-03-16 20:34:28 +00:00
972c2c86ef OStatus: Likes from Pleroma will now work 2018-03-15 21:33:28 +00:00
2bedead6f4 Remove commented code 2018-03-14 22:31:52 +00:00
5bd519efff There is now a "content-warning" field 2018-03-14 22:28:35 +00:00
6352aa112b Add the nsfw removal behind a config switch 2018-03-14 07:13:17 +00:00
f49391a21c "nsfw" at "content warning" content doesn't fit together 2018-03-13 22:39:08 +00:00
3f6fefaa9a Pleroma with the Mastodon UI handles content warning different 2018-03-13 21:58:05 +00:00
32ee4ca4b1 OStatus: Fixed communication issues with deleted contacts 2018-03-13 06:21:44 +00:00
23718aeae3 OStatus: Only posts from followers will be imported (Issue 4369) 2018-03-12 10:45:40 +00:00
b7a5e076fc Fix: The ownership of forum items had been wrong 2018-03-11 18:12:38 +00:00
cc4347d72f Issue 4497: Forum feeds had been empty 2018-03-11 14:01:40 +00:00
Michael Vogel
28615ae24b
Merge pull request #4576 from MrPetovan/bug/fix-attach-display
Formatting changes to Protocol/Feed
2018-03-11 00:43:16 +01:00
Hypolite Petovan
9b14165cc8 Formatting changes to Protocol/Feed
- Change attribute name condition
- Singularize $attributes variable name
2018-03-10 18:35:24 -05:00
Michael Vogel
2009c06195
Merge pull request #4573 from MrPetovan/bug/fix-attach-display
Add support for Atom enclosure
2018-03-11 00:34:26 +01:00
Hypolite Petovan
a80d77f328 Add support for Atom enclosure 2018-03-10 12:40:21 -05:00
3e51fa73b1 Additional checks 2018-03-09 05:38:15 +00:00
c9095386c8 Diaspora: Avoid warning "supplied key param cannot be coerced into a public key" 2018-03-09 05:31:13 +00:00
f23596421d Avoid SQL errors due to duplicate entries in the "participation" table 2018-03-08 21:04:11 +00:00
c438e47827 Bugfix: Avoid "Class not found" error 2018-03-08 19:58:35 +00:00
713bdb4bd9 Improved reshare behaviour for DFRN posts 2018-03-08 19:47:18 +00:00
Hypolite Petovan
789561c7a2 Remove/Update references to include/html2*.php 2018-03-07 16:34:17 -05:00
Hypolite Petovan
5e806ff598 Replace html2plain calls by HTML::toPlaintext 2018-03-07 16:29:44 -05:00
Hypolite Petovan
b5666bd27f Replace html2bbcode calls by HTML::toBBCode 2018-03-07 16:24:13 -05:00
Hypolite Petovan
bb7f459b47 Remove references to include/bb2diaspora.php 2018-03-04 17:43:41 -05:00
Hypolite Petovan
26ea6f69d7 Update references to bb2diaspora and diaspora2bb 2018-03-04 17:39:41 -05:00
Hypolite Petovan
41678ec3cd Add no_update flag to speed up Contact::getIdForURL instances 2018-03-01 19:54:45 -05:00
0cc121cf44 Bugfix: Deleting comments via DFRN had only partly worked 2018-03-01 21:52:36 +00:00
d4c95e0032 Contact updates should now work more reliable 2018-02-26 21:53:42 +00:00
a74b5fdde8 When refreshing the fcontact, the returned array was incomplete 2018-02-22 09:59:21 +00:00
ae705261f1 Function is only used locally 2018-02-21 05:21:55 +00:00
a59796d1d4 No gcontact-id anymore (It wasn't really used) 2018-02-21 05:15:55 +00:00
d0fa80b195 Issue 4228: Don't post an item if it belongs to a picture upload without an post 2018-02-18 17:29:14 +00:00
a9a85849f4 Issue 4369: Added logging to know why a post is stored 2018-02-18 16:43:18 +00:00
Hypolite Petovan
9e3bae5caa Remove references to include/bbcode.php 2018-02-14 22:01:14 -05:00
Hypolite Petovan
0c52866693 Refactor bbcode() into BBCode::convert() 2018-02-14 21:33:55 -05:00
2f71a6f80f DFRN: Bugfix for not storing mails 2018-02-14 22:08:16 +00:00
43b1eccbcd Bugfix and improvements for unmarking potentially archived contacts 2018-02-14 21:18:16 +00:00
Hypolite Petovan
cdc8a3b68d
Merge pull request #4457 from annando/accept-archived
Diaspora: Accept posts from archived contacts
2018-02-14 09:46:24 -05:00
878b2be63d Diaspora: Accept posts from archived contacts 2018-02-14 14:29:28 +00:00
Hypolite Petovan
d8e9ed5ff8 [Scrutinizer] Fix undeclared variables in src/Protocol/
- Use dba::selectFirst to remove intermediate variables `$r`
- Remove unused variable `$sender` in Protocol\Email
- Simplify Protocol\OStatus:fetchAuthor cascading queries
2018-02-13 23:58:46 -05:00
rabuzarus
5fe7a21482 add $no_photos parameter to add_page_info_data() 2018-02-12 03:56:20 +01:00
30cfca40d8 Use a more simple HTML for API output 2018-02-10 13:33:15 +00:00
a2f172e084 Bugfix for check that the DFRN entry already exists 2018-02-09 06:20:01 +00:00
0093f863fd Don't add already queued items from Diaspora to the queue again 2018-02-08 11:26:24 +00:00
85c8bf0228
Merge pull request #4399 from MrPetovan/task/3878-move-include-bbcode-to-src
Move include/bbcode to src/ part 1 : Everything but bbcode()
2018-02-07 07:18:39 +01:00
e609de2957 Many item calls are now isolated in a single function 2018-02-06 12:40:22 +00:00
Adam Magness
db8ef98537 Rename functions
rename functions from review comments
2018-02-05 12:48:22 -05:00
Adam Magness
4be49e706b Remove requires
remove require_once for old file
2018-02-05 12:47:37 -05:00
Adam Magness
7ffcb25321 Update function names and calls
update function names and calls from other files
2018-02-05 12:47:04 -05:00