1
1
Fork 0
Commit graph

324 commits

Author SHA1 Message Date
friendica
e29dd081ca render the recycle symbol correctly on Diaspora reshares 2012-07-04 22:44:04 -07:00
Zach Prezkuta
59ebe6f111 ok now I'm just making silly mistakes--take out premature function locking code 2012-06-23 22:28:28 -06:00
Zach Prezkuta
0877c5b687 use author handle instead of sender handle 2012-06-23 22:04:20 -06:00
Zach Prezkuta
90f8454190 allow linking to Diaspora's scaled-down images 2012-06-23 11:02:15 -06:00
Michael Vogel
a81af2e042 Merge remote branch 'upstream/master'
Conflicts:
	include/bb2diaspora.php
2012-06-23 12:50:00 +02:00
Michael Vogel
7a4ad4564d Diaspora: Messages are now looking better 2012-06-23 12:42:01 +02:00
Zach Prezkuta
73c6f40ebc create new signed text for relayables right when relaying them 2012-06-20 20:52:09 -06:00
Michael Vogel
3968e77f9e New function to convert bbcode to markdown. 2012-06-17 19:49:05 +02:00
Zach Prezkuta
3132ed2979 more cleanup 2012-06-16 10:45:26 -06:00
Zach Prezkuta
577cfdd314 some cleanup of obsolete code 2012-06-16 10:41:25 -06:00
Zach Prezkuta
0946c4a375 still need the original author information for comments and likes 2012-06-16 10:25:33 -06:00
Zach Prezkuta
09eb52810b update signature checking for relayables 2012-06-16 10:25:32 -06:00
Zach Prezkuta
9920fb39e5 Debugged implementation of Diaspora relayable_retractions
Diaspora "relayable_retraction" is now supported by Friendica.
The following should now work:

	Friendica top-level post:
	Diaspora comment deleted, disappears in Friendica
	Friendica comment deleted, disappears in Diaspora
	Diaspora like retracted, disappears in Friendica
	Friendica like retracted, disappears in Diaspora

	Diaspora top-level post:
	Same

There are still exceptions, however. First, Friendica and Diaspora
seem to frequently reject comments with an "invalid signature" error.
This can probably be fixed.

Also, some comments/likes/retractions seem to just disappear on the
Diaspora side. In the Diaspora log these seem to be accompanied by a
"not a valid object" error, often preceeded by a "received a comment
but no corresponding post" error. These seem to be purely internal,
since sometimes it works for some Diaspora contacts but not others.
2012-06-03 14:53:30 -06:00
Zach Prezkuta
06263f72a8 cleanup and logging 2012-06-03 14:53:30 -06:00
Zach Prezkuta
cde0de965f first shot at getting like/unlike functions to work consistently 2012-06-03 14:53:30 -06:00
Zach Prezkuta
77962aa79d Fix bugs in the retraction code
Currently, the following seems to be the functional status:
	For a Diaspora top-level post:
		Friendica comments show up AND delete
		Diaspora comments show up AND delete for top-level owner
		Diaspora comments show up for non-owner
		Diaspora comments sometimes don't delete for non-owner
			-> Appears to be Diaspora's fault, as a "not a valid object" error shows up in the log

		Friendica likes show up, but can't unlike (Friendica doesn't even message Diaspora)
		Diaspora likes show up
		Diaspora non-owner can't unlike
			-> Same as comments, seems to be Diaspora's fault

	For a Friendica top-level post:
		Friendica comments show up AND delete
		Diaspora comments show up AND delete

		Friendica likes don't show up in Diaspora sometimes
		Friendica doesn't even message Diaspora for unlikes (sometimes?)
		Diaspora likes and unlikes work
2012-06-03 14:53:30 -06:00
Zach Prezkuta
c0af6dbb1a Implement relaying of relayable_retractions
Also: some whitespace cleanup, fix Diaspora parent DB query
2012-06-03 14:53:29 -06:00
Zach Prezkuta
1fe1ac022f Support relayable_retractions that are relayed to us by the top-level post owner 2012-06-03 14:53:29 -06:00
friendica
93bc29a711 turn registration code into a standalone function for re-use 2012-05-31 19:06:17 -07:00
Zach Prezkuta
d5116689af query using both id and parent 2012-05-31 19:45:58 -06:00
friendica
7b0ded3f14 more private forums, default privacy group for new contacts 2012-05-17 22:44:52 -07:00
friendica
189a31e628 If a contact has had delivery issues in the last 15 minutes, send new posts straight to the queue
and don't even try to connect. Also defer polling for stuck contacts. Should reduce the number of
stuck processes trying to connect with dead or dying servers significantly.
2012-05-07 15:54:49 -07:00
friendica
2064d86cb3 separate tag search from body search 2012-04-23 22:41:32 -07:00
friendica
2170df897b bug #388 - notify_comment received after post deleted 2012-04-22 19:19:02 -07:00
Alexander Kampmann
355c42cb30 Merge branch 'master' of https://github.com/friendica/friendica
Conflicts:
	include/config.php
	update.php
2012-04-05 13:39:15 +02:00
friendica
37801dd6ed also block outbound 2012-04-04 20:48:35 -07:00
friendica
0c7710681c log disabled requests 2012-04-04 18:49:39 -07:00
friendica
62c60fd53d bug: diaspora_enabled setting turns it on but doesn't fully turn it off. 2012-04-04 14:13:34 -07:00
friendica
5d35f0d54a add title to D* posts 2012-04-01 19:16:13 -07:00
friendica
4e4f7ac79f some reported warnings cleaned up 2012-03-28 20:50:09 -07:00
friendica
3aacc119a1 block filed items from deletion 2012-03-24 04:16:27 -07:00
friendica
58940175e1 wrong link in d* comment notifications 2012-03-16 15:07:45 -07:00
friendica
be1bd9ff4e notification for disapora comments 2012-03-16 05:19:29 -07:00
friendica
2c7da5d0de scale external images 2012-02-25 14:22:51 -08:00
friendica
9441ff5142 string update for 2.38 2012-02-24 22:47:43 -08:00
friendica
f9eddad44f allow forum posts by followers on Diaspora 2012-02-22 19:56:28 -08:00
friendica
1b9c03f6fc new notifications - implement storage 2012-02-18 02:57:42 -08:00
friendica
1b445d511b another sql typo 2012-02-16 00:08:38 -08:00
friendica
ada2a555dc sql typo in auto-friend with D* 2012-02-15 23:58:28 -08:00
friendica
a869bd2fe5 don't link tags enclosed inside Diaspora links 2012-02-07 02:16:28 -08:00
friendica
8fe5168259 restore diaspora test mode 2012-01-26 20:46:42 -08:00
friendica
11aa83742e more logging of D* photo transactions 2012-01-22 15:25:29 -08:00
friendica
8aa2552372 add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit) 2012-01-18 16:21:30 -08:00
friendica
5b809328af send diaspora share notification back to originator for auto friending 2012-01-05 13:25:43 -08:00
friendica
d0b743529d support auto-friend page types for Diaspora 2012-01-04 14:30:25 -08:00
friendica
fc7d0360bb add verb and item to notifications to aid in localisation 2012-01-03 20:26:20 -08:00
friendica
da21473c34 add notifications to d* private messages 2011-12-27 15:49:47 -08:00
friendica
dacbbfaafb bug #188 diaspora_signed_retraction not removing post 2011-12-21 14:42:12 -08:00
friendica
63f66a5a93 bug 244 multiple birthday reminders from Diaspora if profile changed repeatedly 2011-12-19 19:06:25 -08:00
friendica
79f3bbbf2b more data checking, cleans up some infrequent php errors 2011-12-19 16:51:57 -08:00
friendica
7eba8adbf7 pm replies 2011-12-06 19:15:42 -08:00
friendica
0c24784f5e include diaspora mentions in personal (requires adding a Diaspora profile url because they don't use ours) 2011-12-06 15:24:01 -08:00
friendica
be8e9d3616 d* pm 2011-12-06 00:16:13 -08:00
friendica
6fc9eae9de more d* PM stuff 2011-12-04 17:26:55 -08:00
friendica
37730ecc2a typo 2011-11-30 17:08:16 -08:00
friendica
aa73d38845 begininning d* conversation mode 2011-11-29 01:19:09 -08:00
friendica
ccef899577 start of d* private mail, dba without mysqli 2011-11-27 17:41:23 -08:00
friendica
cf7568efd7 extract private images before bbcode translation since preg has issues with large data sizes. 2011-11-27 04:09:14 -08:00
friendica
7b58de743a add a few more sql indexes 2011-11-15 23:12:56 -08:00
Friendika
cf82174520 bug #198 - create activitystream 'friends with' message for Diaspora confirmations 2011-11-12 04:06:33 -08:00
Friendika
327105a4ea try and fix diaspora multiple items queued issue 2011-11-06 16:48:13 -08:00
Friendika
f07c0b2cfb implement signed_retractions 2011-11-05 14:45:29 -07:00
Friendika
0975ea8610 add attachments to Diaspora posts 2011-11-01 17:30:52 -07:00
Friendika
573670fa0c more social graph stuff 2011-11-01 16:08:07 -07:00
Friendika
b025981858 yet more diaspora images to scale 2011-10-28 16:13:54 -07:00
Friendika
e5992003e8 better handling of remote urls - especially FB opengraph 2011-10-28 02:50:00 -07:00
Friendika
72d74b88be some dspr fixes 2011-10-25 19:59:57 -07:00
Friendika
3512adda33 never enough comments 2011-10-23 19:05:32 -07:00
Friendika
6eea312c21 workaround for transmitting photos to D* 2011-10-23 16:01:04 -07:00
Friendika
6e76c86ad2 queue api + queue limits 2011-10-21 03:33:34 -07:00
Friendika
da416e0181 bug in diaspora_reshare 2011-10-20 05:43:33 -07:00
Friendika
96c0598737 diaspora_reshare - even more logging 2011-10-20 03:56:10 -07:00
Friendika
796056f810 provide link to missing d* images 2011-10-20 02:21:57 -07:00
Friendika
852ece39f4 more reshare logging to see what's going on 2011-10-20 02:07:38 -07:00
Friendika
33af8b0e20 diaspora_reshare - another try 2011-10-20 01:16:03 -07:00
Friendika
c4179d989f more debug reshare 2011-10-19 21:34:48 -07:00
Friendika
10b2661176 suppress blank diaspora messages which are awaiting a photo that hasn't arrived 2011-10-19 15:18:41 -07:00
Friendika
19129e06c3 diaspora_reshare no content found, d* profile message work in progress, network page fix for cid search using post order 2011-10-19 15:08:16 -07:00
Friendika
1148cbab22 fix img link format diaspora share/asphoto 2011-10-19 00:29:43 -07:00
Friendika
9043e704f8 diaspora reshares 2011-10-18 15:56:35 -07:00
Friendika
32808a934d string update 2011-10-18 04:28:36 -07:00
Friendika
fb5bddb98f a few issues with diaspora_profile 2011-10-18 01:12:51 -07:00
Friendika
42a9817350 "cubbi.es" 2011-10-17 17:39:25 -07:00
Friendika
af6ab38100 diaspora birthday notifications 2011-10-14 00:20:37 -07:00
Friendika
05e26e4895 handle diaspora profile update message 2011-10-13 18:32:02 -07:00
Friendika
1d05c564d4 missing arg to diaspora_transmit from share/unshare 2011-10-07 15:49:41 -07:00
Friendika
ce11d231b8 use strpos instead of strstr, faster 2011-10-05 21:04:53 -07:00
Friendika
d0bef869db ensure D* photos only attached once 2011-10-05 21:02:00 -07:00
Friendika
4c0ee7f41f bug 173 2011-10-05 20:48:00 -07:00
Friendika
7d6a67f903 mostly cosmetic changes to make DB tables accurately reflect the conversation members 2011-10-05 19:16:05 -07:00
Friendika
4f9c072d66 requeue deliveries on 503 errors which have 'retry-after' headers 2011-09-27 19:27:47 -07:00
Friendika
8d3910c78c sql error diaspora re-queue 2011-09-27 00:58:59 -07:00
Friendika
d6b446d63f starting the big delivery shakeup 2011-09-22 04:11:39 -07:00
Friendika
9edf15d3ef structures for batch mode (Diaspora/zot) 2011-09-20 01:49:08 -07:00
Friendika
97deaa3118 resume strict verification of Diaspora messages 2011-09-19 03:36:41 -07:00
Friendika
2aef98f71d cripple account when expired 2011-09-19 01:17:12 -07:00
Friendika
48ee3fa3b9 build diaspora public (batch) message 2011-09-18 20:17:44 -07:00
Friendika
6c4ad7df3a public D* post fix 2011-09-16 14:57:41 -07:00
Friendika
d7243be2ea log the D* publc messages 2011-09-16 14:51:25 -07:00
Friendika
5a6a3cab8e may fix diaspora send 2011-09-16 14:46:04 -07:00
Friendika
80f94bb12b federation friday update 2011-09-15 17:47:16 -07:00
Friendika
5c0e135fe9 diaspora protocol changes 2011-09-14 19:33:42 -07:00
Friendika
c8f61ef890 no plink on imported D* posts 2011-09-03 05:23:36 -07:00
Friendika
0cfc8570d2 save plink for diaspora items so likes will point to right post 2011-08-31 21:46:37 -07:00
Friendika
f0a4a6af61 relayed likes did not verify 2011-08-30 19:20:56 -07:00
Friendika
0f1bc6e957 log every possible diaspora return for posts and comments 2011-08-29 22:50:41 -07:00
Friendika
454882812e wrong time format string, 24hr clock 2011-08-29 18:01:59 -07:00
Friendika
391330d95f better handling of relayed Diaspora comments 2011-08-29 00:51:08 -07:00
Friendika
846c4cea7c implement delivery queue in case notifier gets killed 2011-08-28 21:41:42 -07:00
Friendika
f29f228463 bring Diaspora message signing back to the source author - whether they like it or not. 2011-08-28 19:22:27 -07:00
Friendika
4572f32603 cleanup 2011-08-28 05:04:49 -07:00
Friendika
41b00a6f3b allow comment relaying for comments which were never Diaspora signed 2011-08-28 05:00:30 -07:00
Friendika
721db93e84 check for existing diaspora comment before accepting, add 'Diaspora' app to item, use html_entity_decode so quotes don't get messed up 2011-08-26 17:52:24 -07:00
Friendika
506853adcd break up delivery into per-person processes 2011-08-26 07:29:22 -07:00
Friendika
21c03fb522 diaspora2bb, salmon fix argument error 2011-08-25 16:37:27 -07:00
Friendika
a775474dff cleaned up the conditions on when to and when not to relay. 2011-08-24 04:42:28 -07:00
Friendika
b6fdd3c76b turn off notifier - runaway 2011-08-24 01:55:34 -07:00
Friendika
2aa23843e4 D* queue 2011-08-24 01:21:24 -07:00
Friendika
2cfdcee29a author and owner sign exactly the same string - apparently 2011-08-23 19:54:35 -07:00
Friendika
6a052c3586 correct time in photo msg 2011-08-23 19:01:08 -07:00
Friendika
c1acea330c photo fixes 2011-08-23 18:50:18 -07:00
Friendika
56d64316f4 diaspora photos ? 2011-08-23 18:17:35 -07:00
Friendika
8cfbe2c432 include bb2diaspora at top level 2011-08-23 03:02:31 -07:00
Friendika
561051e805 convert bbcode to markdown for diaspora (first try, will need tweaking) 2011-08-23 01:00:29 -07:00
Friendika
56ea11a561 bad param in like function 2011-08-22 23:18:22 -07:00
Friendika
b9e4668f68 d* retractions 2011-08-22 20:35:34 -07:00
Friendika
b0211499c1 invoke notifier 2011-08-22 19:27:40 -07:00
Friendika
564ade0685 store key with contact record 2011-08-22 04:55:09 -07:00
Friendika
812222fb17 correct the diaspora_like signable string format 2011-08-22 01:57:52 -07:00
Friendika
4ec706cfc7 log the friend request - it's important 2011-08-21 17:48:42 -07:00
Friendika
213f832443 add trailing slash to diaspora notify url on send 2011-08-21 17:24:50 -07:00
Friendika
e3eb4c131f D* likes not verifying, ignore result until we figure out the signable_string exactly 2011-08-21 04:18:39 -07:00
Friendika
a3eb73ed11 diaspora sign/verify requires SHA0 hash algorithm 2011-08-20 20:54:03 -07:00
Friendika
c6f0d997e6 set author/owner on likes 2011-08-20 18:14:19 -07:00
Friendika
c6cab2cfa8 get_app for diaspora_like 2011-08-20 18:08:43 -07:00
Friendika
f5c0443b91 sql syntax 2011-08-20 18:05:05 -07:00
Friendika
c6a05443f7 stricmp does not exist - strcasecmp does 2011-08-20 17:50:39 -07:00
Friendika
8fa6f49242 until algorithm is sorted, ignore D* verification failures so we can debug the rest 2011-08-20 15:09:09 -07:00
Friendika
0d9d576aa6 move encryption functions to crypto file 2011-08-20 04:53:11 -07:00
Friendika
8e24db3ef5 incorrect iv length for blocksize 2011-08-19 14:34:28 -07:00
Friendika
9a52b15271 don't allow removal of self contact 2011-08-19 05:20:30 -07:00
Friendika
b49175ec5d more logging 2011-08-19 04:48:54 -07:00
Friendika
16129a4b8c better reporting when d* parent not found 2011-08-19 02:53:44 -07:00
Friendika
395faae0b2 double url encode diaspora communications 2011-08-19 02:24:30 -07:00
Friendika
4cef4ec918 fix d* intros 2011-08-18 22:03:58 -07:00
Friendika
0a0c5013ce debug 2011-08-18 22:01:35 -07:00
Friendika
9167b2057b diaspora share - blocked specified twice 2011-08-18 21:50:41 -07:00
Friendika
c05c20aa56 set writable (e.g. writeable) flag for Diaspora contacts 2011-08-18 21:31:34 -07:00
Friendika
d2c6c21a88 lots more diaspora communications - can see light at the end 2011-08-18 21:09:44 -07:00
Friendika
012e039dae store signature data if applicable for relaying 2011-08-18 05:08:39 -07:00
Friendika
c534dd2969 fill and expire fcontact cache 2011-08-18 04:20:30 -07:00
Friendika
9634287839 fix several probe related issues 2011-08-17 23:01:44 -07:00
Friendika
db03b1ab17 diaspora continued... 2011-08-17 04:24:26 -07:00
Friendika
673e114bbd D* like and start of relay code 2011-08-16 22:31:14 -07:00
Friendika
2c0404fdc8 cleanup after refactor 2011-08-16 00:52:34 -07:00
Friendika
c7197b99f9 refactor the diaspora contact logic 2011-08-15 23:19:17 -07:00
Friendika
d0c8f11dff typos 2011-08-15 21:01:44 -07:00
Friendika
9634bb514f doh! add body to the item 2011-08-15 19:46:47 -07:00
Friendika
a93b6757b1 set parent-uri for top level posts 2011-08-15 19:39:49 -07:00
Friendika
44918e2736 turn diaspora posts into x-www-form-urlencoded 2011-08-15 17:14:51 -07:00
Friendika
805770521e errant debug statement 2011-08-15 06:27:17 -07:00
Friendika
5d6155a968 fixes share from diaspora 2011-08-15 05:27:24 -07:00
Friendika
d723ff4770 diaspora top level status posts, string update 2011-08-14 21:23:02 -07:00
Friendika
0729e205c8 diaspora follow from friendika 2011-08-14 20:38:31 -07:00
Friendika
025485ea69 partially fill in diaspora stub functions for comments and likes - these both need lots more work 2011-08-13 19:03:59 -07:00
Friendika
4b4ff75b72 basic post message from diaspora (untested) 2011-08-13 16:39:59 -07:00
Friendika
88f94325a4 incoming diaspora share notification turned into Friendika friend request 2011-08-13 06:52:33 -07:00
Friendika
aefc6209a3 improved diaspora discovery 2011-08-12 03:01:11 -07:00
Friendika
72873cd827 diaspora function dispatcher 2011-08-10 05:10:48 -07:00
Friendika
1bfe1283aa crypto stuff 2011-08-09 18:55:46 -07:00
Friendika
49be394182 diaspora - remove debugging code on encrypt/decrypt 2011-08-09 06:40:28 -07:00
Friendika
70017ebb8c diaspora encrypt+decrypt working !! 2011-08-09 02:53:51 -07:00
Friendika
07c48191b6 AES_256_CBC 2011-08-08 21:51:56 -07:00
Friendika
df3062c612 basic diaspora encryption 2011-08-08 21:44:29 -07:00