Brion Vibber
3c61f45de1
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
2010-02-21 18:56:41 -08: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
f6ebe81538
Performance fix for FriendFeed sup interface: MySQL query optimizer was doing a table scan on notice; explicit subquery makes it run much more efficiently, only scanning items within the period under consideration. Standard subquery should be PostgreSQL-compatible.
2010-02-21 15:21:18 -08:00
Siebrand Mazeland
daccaeb748
Localisation updates for !StatusNet from !translatewiki.net !sntrans
...
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-02-22 00:06:47 +01:00
Zach Copley
ca2a88545d
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-21 14:44:28 -08:00
Zach Copley
10281d59f4
Add PoCo namespace to notice feeds
2010-02-21 14:43:28 -08: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
ab3db8c899
Combine code that finds mentions into one place and add hook points
...
Combined the code that finds mentions of other profiles into one place.
common_find_mentions() finds mentions and calls hooks to allow
supplemental syntax for mentions (like OStatus).
common_linkify_mentions() links mentions.
common_linkify_mention() links a mention.
Notice::saveReplies() now uses common_find_mentions() instead of
trying to parse everything again.
2010-02-21 16:20:30 -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
2d9d444b05
Pulling PubSubHubbub plugin out of default list for 0.9.x; not compatible with recent changes to Atom feed generation for OStatus.
2010-02-21 11:13:57 -08: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
3e7a2a4014
Fix for doc action on systems that return false for globbing in a non-existing dir
2010-02-21 11:11:37 -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
d5ba9e1b10
add feed-level author for user atom feeds
2010-02-21 13:03:13 -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
e9d22138ef
permalink on a note represented by rel=alternate
2010-02-21 09:23: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
9498a16480
Notice::saveNew() accepts url and rendered options
2010-02-21 09:17:00 -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
a3de4caf49
make sure argument to Fave::addNew() is a profile
2010-02-20 20:31:06 -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