Tupambae_Org/friendica_2021-01
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
16296 commits 2 branches 0 tags 132 MiB
Commit graph

505 commits

Author SHA1 Message Date
Michael
6a511066c4 Threaded comments will now be transmitted 2016-12-27 14:37:48 +00:00
Michael
ce4c542e37 Support for threaded comments 2016-12-27 12:59:15 +00:00
Roland Häder
20e71d21a6 Merge branch 'rewrites/app_get_baseurl_static' into develop 
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	mod/admin.php
	mod/bookmarklet.php
	mod/community.php
	mod/contacts.php
	mod/crepair.php
	mod/editpost.php
	mod/events.php
	mod/install.php
	mod/lostpass.php
	mod/network.php
	mod/notify.php
	mod/suggest.php
	mod/uexport.php
	mod/videos.php
	view/theme/duepuntozero/config.php
	view/theme/frio/config.php
	view/theme/quattro/config.php
	view/theme/vier/config.php
 2016-12-22 11:37:23 +01:00
Roland Häder
ad20c5504d Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static 
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	include/diaspora.php
	object/Item.php
 2016-12-22 11:33:00 +01:00
Roland Häder
c0df692f5f Merge remote-tracking branch 'upstream/develop' into develop 
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	include/diaspora.php
	object/Item.php
 2016-12-22 11:29:56 +01:00
Hypolite Petovan
769b849665 url_from_contact_guid: move network constant to arg list 2016-12-20 20:52:42 -05:00
Roland Haeder
6c0c9d542a
Continued with coding convention: 
- added curly braces around conditional code blocks
- added space between if/foreach/... and brace
- rewrote a code block so if dbm::is_result() fails it will abort, else the id
  is fetched from INSERT statement
- made some SQL keywords upper-cased and added back-ticks to columns/table names

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-20 21:16:49 +01:00
Roland Haeder
af2909bf8f
Continued with coding convention: 
- added curly braces around conditional code blocks
- added space between if/foreach/... and brace
- rewrote a code block so if dbm::is_result() fails it will abort, else the id
  is fetched from INSERT statement
- made some SQL keywords upper-cased and added back-ticks to columns/table names

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-20 21:13:50 +01:00
Hypolite Petovan
b631442760 Misc changes to url_from_contact_guid 
- Rename url_from_fcontact_guid to url_from_fcontact_guid
- Use network name constant
- Standards
 2016-12-20 14:33:33 -05:00
Hypolite Petovan
e8e1f9253d Merge remote-tracking branch 'friendica/develop' into bug/fix-diaspora-people-links 
# Conflicts:
#	include/follow.php
 2016-12-20 12:50:36 -05:00
Hypolite Petovan
177f93f9a5 diaspora.php: Standards, standards everywhere 2016-12-20 12:49:50 -05:00
Hypolite Petovan
155e777d19 replace_people_guid: Break down nested calls 
- Fix typo in function name
- Fix arguments
- Simplify url_from_fcontact_guid
 2016-12-20 12:49:32 -05:00
Hypolite Petovan
4a7c3b9eef Diaspora: Fix class name case + add self 2016-12-20 12:44:15 -05:00
Michael
4aafbb09a5 The object type "photo" is deprecated and was replaced by "image" 
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	include/like.php
	mod/photos.php
	mod/subthread.php
 2016-12-20 16:00:23 +01:00
Tobias Diekershoff
cc16369b6f Merge pull request #3033 from annando/1612-object-type 
The object type "photo" is deprecated and was replaced by "image"
 2016-12-20 15:44:07 +01:00
Michael
6e46987515 The object type "photo" is deprecated and was replaced by "image" 2016-12-20 07:10:47 +00:00
Hypolite Petovan
81d003cad1 Diaspora: Complete /people/* links from fcontact or author domain 2016-12-19 23:30:50 -05:00
Roland Häder
a905522eb5 Cleanup for #3010 - added spaces, thanks to @annando . 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-14 09:42:36 +01:00
Roland Häder
63610c7b73 Merge branch 'rewrites/dbm_is_result' of github.com:Quix0r/friendica into rewrites/dbm_is_result 
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	include/Photo.php
	include/api.php
	include/cache.php
	include/dbstructure.php
	include/enotify.php
	include/items.php
	include/onepoll.php
	include/queue_fn.php
	include/session.php
	include/text.php
	mod/contacts.php
	mod/dfrn_request.php
	mod/display.php
	mod/events.php
	mod/item.php
	mod/message.php
	mod/msearch.php
	mod/photos.php
	mod/poco.php
	mod/profile.php
	mod/proxy.php
	mod/videos.php
	update.php
	view/theme/diabook/theme.php
	view/theme/vier/theme.php
 2016-12-13 11:00:44 +01:00
Michael
89d5aa64ba Mark contacts as dead or undead while transmitting and receiving messages 2016-11-19 20:10:29 +00:00
Michael
e925c4139c Some documentation 2016-11-13 18:28:55 +00:00
Michael
26936755d9 Bugfix: Locations without coordinates aren't good for Diaspora 2016-11-13 17:42:26 +00:00
Roland Haeder
c825cc8d0d
This merge brings back dbm::is_result() where I could find it. 
Merge branch 'develop' of github.com:friendica/friendica into rhaeder-develop

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-09-18 23:21:18 +02:00
Michael Vogel
80bfcc7694 The handle (user@domain.tld) for Diaspora contacts must always be lowercase 2016-08-23 07:48:48 +02:00
Michael Vogel
0cba02a805 Added priority to some forgotten proc_run calls 2016-08-03 18:24:22 +02:00
Michael Vogel
1603aa41ef Bugfix: There was an SQL error when adding new entries in the fcontact table 2016-07-15 17:25:30 +02:00
Michael Vogel
2c5fb55725 Diaspora: Link to protocol description added. Support for creation date of comments 2016-07-14 07:20:20 +02:00
Tobias Diekershoff
26098fa263 Merge pull request #2671 from annando/1607-diaspora-soapbox-connect 
Bugfix: Diaspora connect requests to soapbox account work now
 2016-07-10 13:55:56 +02:00
Michael Vogel
9ac26802ce Diaspora: Send the profile data after a successful connect 2016-07-10 13:11:09 +02:00
Michael Vogel
19377f2a9c Just make the bugfix a little bit simpler 2016-07-10 12:18:10 +02:00
Michael Vogel
84aa01b377 Bugfix: Diaspora connects to a Soapbox account weren't established correctly 2016-07-10 12:09:58 +02:00
Michael Vogel
e43a90252c Diaspora: Relayed retraction hadn't worked. 2016-07-08 20:39:14 +02:00
Michael Vogel
c1ce7059b6 If it doesn't work with the new method, try the old one 2016-06-30 22:58:56 +02:00
Michael Vogel
e5dd67121f Some logging added. 2016-06-30 22:42:46 +02:00
Michael Vogel
97abbe83f4 Diaspora: Support for reading the /fetch/post/ functionality 2016-06-30 22:18:48 +02:00
Michael Vogel
24e0fffa2e Small bugfix 2016-06-30 07:56:06 +02:00
Michael Vogel
d125939888 Just some more centralised functionality 2016-06-30 07:46:00 +02:00
Michael Vogel
99f0746660 Cleaned up the code 2016-06-30 07:32:07 +02:00
Michael Vogel
2c7fd1cb3c It should be now valid 2016-06-30 01:18:44 +02:00
Michael Vogel
2d72e2d932 Diaspora: Support for new fetch functionality (replacement for /p/) 2016-06-29 22:50:30 +02:00
Michael Vogel
230a645307 Diaspora: Another Bugfix for the new protocol 2016-06-29 20:37:04 +02:00
Michael Vogel
152efdaec5 Diaspora: Incompatibilities with signature check solved 2016-06-29 10:33:43 +02:00
Michael Vogel
0b1188b7fe Imrpoved avatar handling when storing them/partly use of "micro" 2016-06-25 13:56:55 +02:00
Michael Vogel
a657377616 Diaspora: Try to fetch the uri if we already received the message 2016-06-20 22:48:55 +02:00
Michael Vogel
40a44f1571 Some manual revert ... 2016-06-20 22:48:09 +02:00
Michael Vogel
467176fa65 Diaspora: Ensure that we always store the correct URI 2016-06-20 22:43:14 +02:00
Michael Vogel
ea78f63eac Diaspora: Reshares of non native reshares now look better 2016-05-06 08:22:27 +02:00
Michael Vogel
fbc5404522 DFRN: "Hidewall" is now transmitted, "hide" is respected in dfrn and ostatus. 2016-05-04 23:21:30 +02:00
Michael Vogel
761fa37f94
Diaspora: Comments and Likes are now signed at any time 2016-05-01 13:48:52 +02:00
Michael Vogel
0e79f8cbca
Some small Diaspora changes 2016-05-01 13:48:52 +02:00
Michael Vogel
535f382c4e
Bugfix: "default_group" behaviour wasn't implemented correctly 2016-05-01 13:47:24 +02:00
Michael Vogel
0bf076ecc0
Some changed doxygen header stuff 2016-05-01 13:47:24 +02:00
Michael Vogel
ce603cbb49
And some more doc stuff 2016-05-01 13:47:24 +02:00
Michael Vogel
b198e73ef0
Some more small documentation stuff 2016-05-01 13:47:24 +02:00
Michael Vogel
805f1287d0
Support for the new contact request data type 2016-05-01 13:47:24 +02:00
Michael Vogel
617e1768e1
Avoid a guid whith spaces. 2016-05-01 13:47:24 +02:00
Michael Vogel
721b2edb33
Some more documentation - again. 2016-05-01 13:47:24 +02:00
Michael Vogel
df961742da
Some more code cleaning 2016-05-01 13:47:24 +02:00
Michael Vogel
2a84e7fac1
If the message already exists then the message id should be returned 2016-05-01 13:47:24 +02:00
Michael Vogel
a0c0881e54
Add OEmbed data to the body of reshares 2016-05-01 13:47:24 +02:00
Michael Vogel
0f71d0bd07
Reshare of reshares now work. 2016-05-01 13:47:24 +02:00
Michael Vogel
3414328673
Avoid an empty handle 2016-05-01 13:47:24 +02:00
Michael Vogel
eb511b3fef
Some more documentation - to make @rabuzarus happy 2016-05-01 13:47:24 +02:00
Michael Vogel
8d82bf922e
The signature creation now moved into the Diaspora class. That's much cleaner. 2016-05-01 13:47:24 +02:00
Michael Vogel
f5ac69a0cf
The documentation should now be complete 2016-05-01 13:47:24 +02:00
Michael Vogel
4aec4f5bd4
Just some more documentation 2016-05-01 13:47:24 +02:00
Michael Vogel
f282748c52
Added some documentation, script to generate a basic doxygen header 2016-05-01 13:47:24 +02:00
Michael Vogel
22c889c319
Retraction do work as well 2016-05-01 13:46:08 +02:00
Michael Vogel
f7c9ee5848
Everything tested, one open to-do 2016-05-01 13:46:08 +02:00
Michael Vogel
cc7b34b7e6
Better reshare detection 2016-05-01 13:46:08 +02:00
Michael Vogel
3d8770a9da
Added checklist 2016-05-01 13:46:08 +02:00
Michael Vogel
35d5f4caee
Missing include 2016-05-01 13:46:08 +02:00
Michael Vogel
b84ed78f8f
Values are sanitized, messages are not relayed when there is no signature 2016-05-01 13:46:08 +02:00
Michael Vogel
79fb05ff80
Removed moved function 2016-05-01 13:46:08 +02:00
Michael Vogel
d87e78a488
Reshares now store the original XML as well. 2016-05-01 13:46:08 +02:00
Michael Vogel
357c48076d
Bugfix: XML copy had problems with "&" 2016-05-01 13:46:08 +02:00
Michael Vogel
2898749cc6
The Diaspora class is now productive 2016-05-01 13:46:08 +02:00
Michael Vogel
d176fff214
New implementation is now live. 2016-05-01 13:46:08 +02:00
Michael Vogel
e90af0be68
Decode function is now there as well. 2016-05-01 13:46:08 +02:00
Michael Vogel
599d242e00
Some work at the retractions. 2016-05-01 13:46:08 +02:00
Michael Vogel
c88fd73b80
Just another commit message :-) 2016-05-01 13:46:08 +02:00
Michael Vogel
81f5a359bf
"profile". "like" and "comment" could work, status messages only partly. 2016-05-01 13:46:08 +02:00
Michael Vogel
37e25313a4
New Diaspora code 2016-05-01 13:46:08 +02:00
Michael Vogel
e333efc9aa Diaspora: Comments and Likes are now signed at any time 2016-04-20 23:27:33 +02:00
Michael Vogel
ea8cfed6a9 Some small Diaspora changes 2016-04-19 07:39:17 +02:00
Michael Vogel
d6a79abb68 Bugfix: "default_group" behaviour wasn't implemented correctly 2016-04-13 22:21:23 +02:00
Michael Vogel
f80f4f6a97 Some changed doxygen header stuff 2016-03-28 22:35:11 +02:00
Michael Vogel
7e711d9d62 And some more doc stuff 2016-03-27 23:38:35 +02:00
Michael Vogel
faa9b77a90 Some more small documentation stuff 2016-03-27 23:25:32 +02:00
Michael Vogel
16ef9f4940 Support for the new contact request data type 2016-03-25 00:49:18 +01:00
Michael Vogel
7e7cac19f6 Avoid a guid whith spaces. 2016-03-24 21:32:55 +01:00
Michael Vogel
7bf079d858 Some more documentation - again. 2016-03-24 15:59:53 +01:00
Michael Vogel
7aae852fe0 Some more code cleaning 2016-03-23 22:12:08 +01:00
Michael Vogel
ac35f8c756 If the message already exists then the message id should be returned 2016-03-23 09:22:59 +01:00
Michael Vogel
28dfaa694c Add OEmbed data to the body of reshares 2016-03-23 07:36:17 +01:00
Michael Vogel
62103fe5f4 Reshare of reshares now work. 2016-03-22 23:00:42 +01:00
Michael Vogel
90d4b93424 Avoid an empty handle 2016-03-22 07:13:56 +01:00
Michael Vogel
c284ab5eff Some more documentation - to make @rabuzarus happy 2016-03-21 19:58:45 +01:00
Michael Vogel
d676ae0f32 The signature creation now moved into the Diaspora class. That's much cleaner. 2016-03-19 15:49:47 +01:00
Michael Vogel
5c44a787bf The documentation should now be complete 2016-03-18 22:28:20 +01:00
Michael Vogel
e74587b375 Just some more documentation 2016-03-18 08:07:23 +01:00
Michael Vogel
fab48926d0 Added some documentation, script to generate a basic doxygen header 2016-03-17 23:44:18 +01:00
Michael Vogel
16b92af71f Retraction do work as well 2016-03-17 12:24:23 +01:00
Michael Vogel
88fea17cab Everything tested, one open to-do 2016-03-17 00:37:44 +01:00
Michael Vogel
e058feed28 Better reshare detection 2016-03-16 21:27:07 +01:00
Michael Vogel
468734a26e Added checklist 2016-03-16 19:30:46 +01:00
Michael Vogel
84a475e589 Missing include 2016-03-16 16:49:54 +01:00
Michael Vogel
be001d171b Values are sanitized, messages are not relayed when there is no signature 2016-03-15 20:14:08 +01:00
Michael Vogel
8027854886 Removed moved function 2016-03-15 07:18:11 +01:00
Michael Vogel
eed55664fc Reshares now store the original XML as well. 2016-03-15 00:26:28 +01:00
Michael Vogel
4b5e7007a7 Bugfix: XML copy had problems with "&" 2016-03-14 23:54:01 +01:00
Michael Vogel
dc2e7a66b3 The Diaspora class is now productive 2016-03-14 23:11:43 +01:00
Michael Vogel
2841aa0281 New implementation is now live. 2016-03-13 19:47:02 +01:00
Michael Vogel
07818a6553 Decode function is now there as well. 2016-03-13 16:14:51 +01:00
Michael Vogel
918efbafac Merge remote-tracking branch 'upstream/develop' into 1602-diaspora 2016-03-06 21:20:00 +01:00
Michael Vogel
8752ec11b2 Central function for default group, special setting for OStatus 2016-03-06 13:15:27 +01:00
Michael Vogel
66919761ab Some work at the retractions. 2016-03-02 23:28:20 +01:00
Michael Vogel
009cadf63b Just another commit message :-) 2016-03-01 19:10:35 +01:00
Michael Vogel
6d3581dac8 "profile". "like" and "comment" could work, status messages only partly. 2016-02-29 08:02:50 +01:00
Michael Vogel
a3960bda37 New Diaspora code 2016-02-27 23:54:17 +01:00
fabrixxm
fdb864157d Merge pull request #2299 from annando/1601-contact-photos 
Improved avatar storage in contacts
 2016-01-29 05:26:26 +01:00
Michael Vogel
b3e86f4e6b There is now a central function for item notifications 2016-01-28 22:58:05 +01:00
Michael Vogel
78e79de7c9 New central function to store avatar data in contacts 2016-01-28 11:09:08 +01:00
Michael Vogel
6f662b8c74 New avatar picture fields to better cope with changing avatars 2016-01-28 01:26:19 +01:00
Michael Vogel
e1bc0b4ff8 Likes are now federated again through Diaspora 2016-01-21 16:01:46 +01:00
Michael Vogel
e00c091540 Small fix for empty signatures 2016-01-21 13:57:21 +01:00
Michael Vogel
54f42cb706 removed some test code 2016-01-21 13:38:30 +01:00
Michael Vogel
d768074afd Comments from Hubzilla weren't federated properly 2016-01-21 13:21:47 +01:00
Michael Vogel
98ccefebcf Reworked check for double encoded Diaspora signatures 2016-01-20 16:00:43 +01:00
Fabrixxm
7e83ba090f Merge branch 'hotfix_diaspora' into develop 2016-01-20 08:50:18 +01:00
Michael Vogel
c6b0e57aa4 Bugfix: Comments weren't relayed anymore to Diaspora due to a Diaspora change 2016-01-20 08:40:04 +01:00
Michael Vogel
c4ba035ee3 Add some analysing stuff, rendered value is written now more often 2016-01-14 21:56:37 +01:00
Michael Vogel
941b5fd11e Some added logging 2016-01-11 14:24:54 +01:00
Michael Vogel
2bad2cdd91 More fields in gcontact, contact search respects "hide" setting 2016-01-06 14:13:59 +01:00
Michael Vogel
75e2ec01fe The gcontact will now be connected to the items 2016-01-05 15:34:27 +01:00
Tobias Diekershoff
06defed4cb Merge pull request #2206 from annando/1512-diaspora-sql 
Diaspora: Fixed possible SQL injection
 2015-12-27 07:02:21 +01:00
Michael Vogel
7825704bd6 Diaspora: Fixed possible SQL injection 2015-12-27 03:54:20 +01:00
rabuzarus
3df5c17124 reformat todo according to doxygen style 2015-12-25 23:17:34 +01:00
Michael Vogel
24f1a24208 Support for a new Diaspora command for post retraction 2015-12-03 08:35:47 +01:00
Michael Vogel
107204f405 Diaspora comments/likes: The contact id and the network is now taken from the contact 2015-12-01 15:36:32 +01:00
Michael Vogel
485e65871e Avoid wrong birthdays 2015-10-17 02:36:16 +02:00
Michael Vogel
efbdb57f92 Reworked contact relations between Friendica and Diaspora 2015-10-10 11:06:18 +02:00
Michael Vogel
61c3ce7a21 Bugfix: The contact names had to be escaped 2015-10-08 00:25:55 +02:00
Michael Vogel
c555b1b5cb Only look for the GUID when checking for duplicates. 2015-09-06 07:34:51 +02:00
Michael Vogel
988f32dfc8 Rearranged the dispatcher 2015-09-05 13:26:14 +02:00
Michael Vogel
4b858650ce Check if the author should be ignored when fetching missing posts 2015-09-05 12:11:14 +02:00
Michael Vogel
d1e3ea7b46 Soapbox-Improvements 2015-08-30 19:07:30 +02:00
Michael Vogel
887372a0d7 Bugfix: Conversations with Diaspora now work reliable 2015-08-13 22:49:57 +02:00
Michael Vogel
b24453f8da Messages are now sent to the relay server - and the options are configurable 2015-08-09 20:39:11 +02:00
Michael Vogel
65921bf2e7 Posts from Diaspora are always accepted for the global contact 2015-08-09 14:28:59 +02:00