Commit Graph

1034 Commits

Author SHA1 Message Date
Sarven Capadisli
c88507fe11 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-02-22 17:08:54 +01:00
Sarven Capadisli
3569493ba7 Added link to Subscriptions page to XHR get the ostatus sub form 2010-02-22 17:07:48 +01:00
Sarven Capadisli
e6ce04cbce Generalised Subscription XHR dialogbox 2010-02-22 17:05:43 +01:00
James Walker
2f65fa646a wiring in magicsig 2010-02-22 09:05:52 -05:00
James Walker
e0388cc1d3 adding magic sig stuff 2010-02-22 09:05:32 -05:00
James Walker
8fe097d7d1 Merge remote branch 'statusnet/testing' into testing 2010-02-22 09:03:42 -05:00
Evan Prodromou
75fdef2092 handle poco nicknames in Ostatus_profile 2010-02-22 07:57:44 -05:00
Evan Prodromou
074e3fa895 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-02-22 07:09:08 -05:00
Evan Prodromou
e94800ced9 fix broken link in OpenID documentation 2010-02-22 07:08:57 -05:00
Sarven Capadisli
f54c9b70db Fixed error/warning message location in OStatus autorize subscription page 2010-02-22 11:53:34 +01:00
James Walker
7b2ea7aa22 Merge remote branch 'statusnet/testing' into testing 2010-02-22 01:40:03 -05:00
James Walker
effa4f5d1e adding extlib for Crypt_RSA 2010-02-22 01:39:00 -05:00
Brion Vibber
17ed30dffc OStatus: fix remote subscription when putting webfinger address in the little box 2010-02-22 06:00:13 +00:00
Evan Prodromou
891e002883 don't calculate replies for remote notices 2010-02-21 23:56:48 -05:00
Evan Prodromou
a9599d53c5 some info code for usersalmon.php 2010-02-21 23:39:52 -05:00
Evan Prodromou
e4c4f90c8a don't save Notices that already exist in Salmon 2010-02-21 23:32:20 -05:00
Evan Prodromou
48839a1fcf change erroneous common_sql_time() to common_sql_date() 2010-02-21 23:19:29 -05:00
Evan Prodromou
e39e6cdcc5 was using HTMLPurifier::purify() as a static method, which it is not 2010-02-21 23:16:42 -05:00
Evan Prodromou
aab7ce70dc Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-02-21 23:08:01 -05:00
Evan Prodromou
17c329ba89 add HTMLPurifier config 2010-02-21 23:07:46 -05:00
Brion Vibber
bd3051b85c Merge branch 'testing' of gitorious.org:statusnet/mainline into testing 2010-02-21 19:55:53 -08:00
Brion Vibber
5207783765 OStatus: record source profile & saving method in ostatus_source table; this allows us to distinguish posts that have come through an unverified group feed 2010-02-21 19:52:53 -08:00
Evan Prodromou
cc18f757a8 hook in OStatusPlugin to return Ostatus_profile URIs where applicable 2010-02-21 22:52:52 -05:00
Evan Prodromou
232b5efa7e Add error info for missing URI in attention 2010-02-21 22:44:58 -05:00
Evan Prodromou
13fb7bef78 reversed in_array() arguments in UsersalmonAction 2010-02-21 22:41:02 -05:00
Evan Prodromou
de522d7978 Wasn't putting in namespaces for reply salmons 2010-02-21 22:38:18 -05:00
Evan Prodromou
a0b64663be Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-02-21 22:35:04 -05:00
Evan Prodromou
bd21f48cee Notice::getReplies() returns array of profile IDs 2010-02-21 22:34:40 -05:00
Brion Vibber
892cd801d1 Merge branch 'testing' of gitorious.org:statusnet/mainline into testing 2010-02-21 19:02:23 -08:00
Brion Vibber
ad10e6e8da OStatus: drop the remnants of feedsubsettings, replaced by ostatussub and no longer linked in UI 2010-02-21 19:01:32 -08:00
Evan Prodromou
79c76f1a87 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-02-21 21:57:32 -05:00
Evan Prodromou
be70dd3677 work harder to preserve info when creating new Ostatus_profile 2010-02-21 21:57:09 -05:00
Brion Vibber
d3996996e4 Merge branch 'testing' of gitorious.org:statusnet/mainline into testing 2010-02-21 18:54:06 -08:00
Brion Vibber
78ca45c7a0 OStatus PuSH fixes:
- hub now defers subscription state updates until after verification, per spec
- hub now supports synchronous verification when requested (if async is not requested after)
- client now requests synchronous verification (it's a bit safer)
- cleanup on subscription logging/error responses
2010-02-21 18:51:15 -08:00
Evan Prodromou
273c0e0363 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-02-21 21:39:50 -05:00
Evan Prodromou
912814fb7f use some constants and do some extra output in webfinger output 2010-02-21 21:38:59 -05:00
Evan Prodromou
bd74f05a66 Do mention lookup for Webfinger accounts in OStatusPlugin 2010-02-21 21:38:16 -05:00
Evan Prodromou
bf23c35495 Add OStatus_profile::ensureWebfinger() 2010-02-21 21:37:12 -05:00
Evan Prodromou
fde64ddf26 make some of the Webfinger magic strings constants 2010-02-21 21:36:36 -05:00
Brion Vibber
aa0b2ce81a OStatus PuSH fixlets:
- set minimal error page output on PuSH callback
- allow hub to retry ($config['ostatus']['hub_retries']), simplify internal iface a bit. Retries are pushed to end of queue but otherwise not delayed yet; makes delivery more robust to one-off transitory errors but not yet against downtime.
2010-02-21 14:28:06 -08:00
Evan Prodromou
37179a91d5 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-02-21 17:00:19 -05:00
Evan Prodromou
1c22bf20f1 fixup activity serialization so salmon notifications work 2010-02-21 17:00:05 -05:00
Brion Vibber
5349aa420e OStatus feedsub fixlets:
- actually udpate feedsub.last_update when we get a new PuSH update in
- move incoming PuSH processing to a queue handler to minimize time spent before POST return, as recommended by PuSH spec. When queues are disabled this'll still be handled immediately.
2010-02-21 13:40:59 -08:00
Evan Prodromou
10f6c023f4 include namespaces in posted activities in notifyActivity() 2010-02-21 16:23:55 -05:00
Evan Prodromou
4209082677 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-02-21 14:18:16 -05:00
Evan Prodromou
ad3406a919 use Ostatus_profile::ensureActivityObjectProfile() in SalmonAction::ensureProfile() 2010-02-21 14:17:37 -05:00
Evan Prodromou
16a43b1154 slightly more robust remote profile creation 2010-02-21 14:14:45 -05:00
Brion Vibber
85528ccb1f Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x 2010-02-21 11:12:56 -08:00
Brion Vibber
588fe5d603 OStatus: debug aid - log the received Salmon post when it can't be parsed properly as an <atom:entry> 2010-02-21 10:48:48 -08:00
Evan Prodromou
de093537f6 correct actor for OStatusPlugin::onEndUnsubscribe() 2010-02-21 13:32:24 -05:00
Evan Prodromou
068d8f9220 correct call to time() in Ostatus_profile::notify() 2010-02-21 13:31:58 -05:00
Evan Prodromou
f83941a67b correct name check in ActivityObject::fromProfile() 2010-02-21 13:31:31 -05:00
Evan Prodromou
5aeed9e041 add activity:subject to atom feeds 2010-02-21 13:11:00 -05:00
Evan Prodromou
1a86bf9c65 try different ways to get a profile from a feed 2010-02-21 12:56:46 -05:00
Evan Prodromou
d372a352ec make avatar attribute explicit for ActivityObject 2010-02-21 12:55:40 -05:00
Evan Prodromou
09e2d181be remove unused profile code from salmonaction 2010-02-21 12:54:52 -05:00
Evan Prodromou
727773cdfa redirect ostatussub if not logged in 2010-02-21 11:24:04 -05:00
Evan Prodromou
df7c6b37c8 use notifyActivity() for notifications in OStatusPlugin 2010-02-21 10:53:32 -05:00
Evan Prodromou
4e90bd34e9 activity notification in Ostatus_profile 2010-02-21 10:53:11 -05:00
Evan Prodromou
ff2efd314f let activities generate their own XML 2010-02-21 10:50:51 -05:00
Evan Prodromou
9898bbdeb2 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Conflicts:
	plugins/OStatus/lib/activity.php
2010-02-21 09:19:27 -05:00
Evan Prodromou
7f471bde23 more tests for Activity parsing 2010-02-21 09:17:52 -05:00
Evan Prodromou
4a4c34de32 Save posted notices in usersalmon 2010-02-21 09:17:35 -05:00
Evan Prodromou
6169d8a877 saving notices in salmon actions 2010-02-21 09:16:27 -05:00
Evan Prodromou
229f9bd069 more complete content retrieval in ActivityObject::__construct() 2010-02-21 09:15:57 -05:00
Brion Vibber
5df61141d2 OStatus: fix regressions from merge 2010-02-20 18:25:40 -08:00
Evan Prodromou
6f1ccfc577 Subscription::start() should be enough, right? 2010-02-20 20:36:54 -05:00
Evan Prodromou
0c62c68675 do some double-checks on favor and disfavor handlers in OStatusPlugin 2010-02-20 20:34:29 -05:00
Evan Prodromou
5565216b42 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Conflicts:
	plugins/OStatus/OStatusPlugin.php
2010-02-20 20:27:04 -05:00
Evan Prodromou
96c6019638 Add support for favor and disfavor notification
Added support for favoring and disfavoring in OStatusPlugin.

Needed to represent the Notice as an activity:object, so added
some code for that in lib/activity.php.

Also, made some small changes to OStatusPlugin so it handled
having a non-default argument $object correctly.
2010-02-20 19:58:20 -05:00
Brion Vibber
145a19954f OStatus: Salmon favorite & unfavorite events now handled 2010-02-20 16:45:30 -08:00
Brion Vibber
9c2fe8492f OStatus: send favorite/unfavorite notifications to remote authors 2010-02-20 15:56:36 -08:00
Eric Helgeson
86f2f530ef Fixed incorrect link on registration successful page 2010-02-20 21:57:05 +00:00
Brion Vibber
ea9d6f21ec OStatus subscription page fixups; works but needs lots of UI loving!
- ostatussub via subscribe button now works again (changed to take profile instead of feed, patched up to the new discovery)
- added a quickie hack to allow putting your remote profile URI in place of webfinger acct through the remote-sub button (needs to be patched up to do proper discovery via XRDS or a link or something)
2010-02-20 12:57:47 -08:00
Brion Vibber
f891b135fb OStatus: fix regressions in plugin & usersalmon action. Sub/unsub notifications are working again. 2010-02-20 10:26:32 -08:00
Brion Vibber
97b01432e7 drop no-longer-used XML_Feed_Parser extlib package from OStatus plugin 2010-02-20 10:06:28 -08:00
Evan Prodromou
866b647062 add hooks for OStatus notification on subscribe/unsubscribe 2010-02-20 11:48:42 -05:00
Evan Prodromou
ab4ec095e8 adjust URI, URL, and location in Ostatus_profile::processPost 2010-02-20 11:38:05 -05:00
Evan Prodromou
ed45df045f Cool bug! Technically good PHP syntax 2010-02-20 11:17:54 -05:00
Evan Prodromou
2df3bbc80b Move some salmon processing to a superclass
Moved some salmon processing to a superclass so we could handle group
salmon posts, too.
2010-02-20 11:12:43 -05:00
Brion Vibber
50db2d5d69 OStatus: Salmon notifications now being generated moderately correctly. :) Needs to be an <entry> not a <feed>. 2010-02-19 17:01:38 -08:00
Brion Vibber
557df3d3f7 OStatus: sub/unsub notifications working again. Fixed up autodetection of feed info at profile setup time 2010-02-19 16:21:17 -08:00
Evan Prodromou
d69f6dff6a Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Conflicts:
	plugins/OStatus/actions/salmon.php
2010-02-19 16:55:24 -05:00
Evan Prodromou
b0327506a4 some more salmon stuff 2010-02-19 16:37:07 -05:00
Brion Vibber
a1a3ab1c58 OStatus: hooked up follow/unfollow events on Salmon endpoint to create/destroy remote subscriber relationships 2010-02-19 12:08:07 -08:00
Brion Vibber
114eb310ca OStatus: fix up Salmon endpoint detection/saving, timestamp fixes. 2010-02-19 10:29:06 -08:00
Evan Prodromou
48edade751 add ActivityContext class and test it 2010-02-18 22:18:14 -05:00
Brion Vibber
0dac13d197 OStatus refactoring to clean up profile vs feed and fix up subscription issues.
PuSH subscription maintenance broken back out to FeedSub, letting Ostatus_profile deal with the profile level (user or group, with unique id URI)
2010-02-18 16:50:53 -08:00
Brion Vibber
22ff358ba8 OStatus sub/unsub updates:
- fix for PuSH unsub verification
- send Salmon notification on unsub
2010-02-18 18:20:48 +00:00
Evan Prodromou
b6e5d4ecc3 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-02-18 06:36:47 -05:00
Evan Prodromou
80ef3946d0 more work on salmon 2010-02-18 06:36:32 -05:00
Zach Copley
a80fdf3142 Twitter bridge - fix for Ticket #2192 2010-02-17 20:56:18 +00:00
Zach Copley
c498f6e1ba Twitter bridge - fix for Ticket #2192 2010-02-17 20:53:16 +00:00
Zach Copley
4d97f83740 Better logging for Twitter bridge account linking process 2010-02-17 19:25:37 +00:00
Zach Copley
6b887728b2 Better logging for Twitter bridge account linking process 2010-02-17 19:24:38 +00:00
Brion Vibber
5a6cbb248f Merge branch 'testing' into 0.9.x 2010-02-17 10:14:08 -08:00
Brion Vibber
3cb6b1670b Merge branch 'master' into testing 2010-02-17 10:13:35 -08:00
Craig Andrews
8e07926a9c parse_url returns an associative array - not an object 2010-02-17 10:10:07 -08:00
Brion Vibber
9f3246124d PostDebug plugin - saves POST data to debug log or directory to help debug form submission and server-to-server communications.
Some sensitive items are sanitized but not all - don't just shove out the log results publicly!
2010-02-17 09:58:34 -08:00
Craig Andrews
46e9aa13aa htmloutputter->script() special cases src's that begin with plugin/ or local/ so that plugins don't need to include common_path() in every call to $action->script()
Adjust plugins to not call common_path() when it's not necessary
Fix minify plugin
2010-02-17 12:03:14 -05:00