Commit Graph

170 Commits

Author SHA1 Message Date
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