Sarven Capadisli
2c09702b2d
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-19 14:22:25 +01:00
Evan Prodromou
52e8aa798a
Refactor subs_* functions for remote use
...
The subs_* functions in subs.php have made a lot of assumptions
about users versus profiles. I've refactored the functions to
be methods of the Subscription class instead, and to use Profile
objects throughout.
Some of the checks for blocks or existing subscriptions depended
on users or profiles, so I've moved those methods around a bit.
I've left stubs for the subs_* functions until we get time to replace
them.
2010-02-19 08:16:45 -05:00
Sarven Capadisli
8d59f7cc9d
Using inlineScript instead for clickjacking check
2010-02-19 13:13:05 +01:00
Sarven Capadisli
b03c7a383f
Only load json2.js if native JSON is not supported
2010-02-19 13:03:26 +01:00
Evan Prodromou
48edade751
add ActivityContext class and test it
2010-02-18 22:18:14 -05:00
Evan Prodromou
3d665f82d1
add type='text/html' to alternate link in Notice Atom
2010-02-18 22:13:47 -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
2a97901f70
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-18 18:22:02 +00: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
Sarven Capadisli
310ac31995
Minor adjustment to edit icon position
2010-02-18 18:12:47 +01:00
Sarven Capadisli
c36155e238
Fixes long strings from not breaking
2010-02-18 18:12:08 +01:00
Evan Prodromou
c2ba764535
always distribute to inbox of author immediately
2010-02-18 07:11:20 -05: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
Brion Vibber
07f145049e
Merge branch 'master' into testing
2010-02-17 16:52:13 -08:00
Brion Vibber
ce6be4f836
Queues: redid the breakout control model so we can start up and subscribe to queues without running through the complete site list, which is ok at 1k sites but too slow at 10k.
...
All breakout queues that we're going to need to listen to now need to be explicitly listed in $config['queue']['breakout'].
Until XMPP is moved to component model, this setting will let the individual processes work with their own queues:
$config['queue']['breakout'][] = 'xmpp/xmppout/' . $config['site']['nickname'];
2010-02-17 16:49:00 -08:00
Zach Copley
73ba26efe3
Twitter bridge - fix for Ticket #2192
2010-02-17 20:58:32 +00:00
Zach Copley
05c50499c3
Better logging for Twitter bridge account linking process
2010-02-17 20:58:24 +00:00
Zach Copley
c201baffbf
Upgrade Twitter bridge to use OAuth 1.0a. It's more secure, and allows
...
us to automatically send in a callback url instead of having to manually
configure one for each StatusNet instance.
2010-02-17 20:58:15 +00:00
Zach Copley
c498f6e1ba
Twitter bridge - fix for Ticket #2192
2010-02-17 20:53:16 +00:00
Zach Copley
6b887728b2
Better logging for Twitter bridge account linking process
2010-02-17 19:24:38 +00:00
Brion Vibber
3cb6b1670b
Merge branch 'master' into testing
2010-02-17 10:13:35 -08:00
Brion Vibber
e8275aa60a
Fix exception on bad plugin load
2010-02-17 10:12:37 -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
Zach Copley
198c046c89
- Set the root of a new local conversation to a new conversation.id
...
- Output conversation URIs from conversation.uri
2010-02-17 01:12:13 -08:00
Zach Copley
ed46a38ecf
- conversation.uri needs to be nullable
...
- factory method for creating new local conversations
2010-02-17 01:11:14 -08:00
Zach Copley
a2f8c5da17
New Conversation DO to handle remote notices as conversation roots
2010-02-16 23:30:08 -08:00
Zach Copley
5886e96217
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
...
* 'testing' of gitorious.org:statusnet/mainline:
OStatus: override source link with the source domain and link to original message
OStatus: moving parts of profile processing to Activity from feedmunger. Pausing before refactoring DB schema a bit to clean up feed vs person vs group info
2010-02-16 20:14:33 -08:00
Zach Copley
2cb243808c
More sensical profile::getUri()
2010-02-16 20:13:39 -08:00
Brion Vibber
e51e96d724
OStatus: override source link with the source domain and link to original message
2010-02-17 02:16:03 +00:00
Brion Vibber
19b03ef797
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-17 01:52:57 +00:00
Brion Vibber
454d0b5738
OStatus: moving parts of profile processing to Activity from feedmunger. Pausing before refactoring DB schema a bit to clean up feed vs person vs group info
2010-02-17 01:49:49 +00:00
Zach Copley
b2a502b336
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
...
* 'testing' of gitorious.org:statusnet/mainline:
OStatus: migrated notice parsing to use Activity helper classes; on the way to killing FeedMunger
2010-02-16 16:23:57 -08:00
Zach Copley
c892726c80
Take remote profiles into account when looking up canonical profile URIs
2010-02-16 16:22:58 -08:00
Brion Vibber
4a139d1cc8
OStatus: migrated notice parsing to use Activity helper classes; on the way to killing FeedMunger
2010-02-16 23:31:11 +00:00
Brion Vibber
014a32e6b8
OStatus: check only direct children in ActivityUtil::child; fixes pulling actor's info when we wanted post info
2010-02-16 23:04:39 +00:00
Brion Vibber
880acb05b0
OStatus: temporary output mode hack for apitimelineuser until PuSH feed generation is updated to use the shared code instead of output buffering
2010-02-16 22:04:57 +00:00
Brion Vibber
440ab90391
OStatus: fix up some recent regressions in subscription setup; fix state checks and verification token, and avatar save on setup. Needs updates for new atom code next...
2010-02-16 22:03:24 +00:00
Brion Vibber
a116cde1a4
OStatus: fix for low-level remote subscribe
2010-02-16 20:11:48 +00:00
Zach Copley
eea52c708b
Add rel="avatar" to img links in <activity:actor> stanzas
2010-02-16 11:32:10 -08:00
Evan Prodromou
201110ffaa
restructure Activity classes to push more DOM stuff to ActivityUtils
2010-02-16 12:49:54 -05:00
Evan Prodromou
3d170bfa30
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-16 12:46:02 -05:00
Evan Prodromou
71ecd68901
add a FIXME to Profile
2010-02-16 12:45:00 -05:00
Brion Vibber
81b6b58e33
Merge branch 'master' into testing
...
Conflicts:
lib/stompqueuemanager.php
2010-02-16 09:22:02 -08:00
Brion Vibber
c74aea589d
Stomp queue restructuring for mass scalability:
...
- Multiplexing queues into groups and for multiple sites.
- Sharing vs breakout configurable per site and per queue via $config['queue']['breakout']
- Detect how many times a message is redelivered, discard if it's killed too many daemons
- count configurable with $config['queue']['max_retries']
- can dump the items to files in $config['queue']['dead_letter_dir']
Queue daemon memory & resource leak fixes:
- avoid unnecessary reconnections to memcached server (switch persistent connections back in on second initialization, assuming it's child process)
- monkey-patch for leaky .ini loads in DB_DataObject::databaseStructure() - was leaking 200k per active switch
- applied leak fixes to Status_network as well, using intermediate base Safe_DataObject for both it and Memcache_DataObject
Misc queue fixes:
- correct handling of child processes exiting due to signal termination instead of regular exit
- shutdown instead of infinite respawn loop if we're already past the soft memory limit at startup
- Added --all option for xmppdaemon... still opens one xmpp connection per site that has xmpp active
Cache updates:
- add Cache::increment() method with native support for memcached atomic increment
2010-02-16 09:16:51 -08:00
Brion Vibber
3d0c3f0577
Pull fix from testing branch: use new encoding funcs w/ stomp queues
2010-02-16 09:15:29 -08:00
Sarven Capadisli
2e258454f3
Minor optimization to only bind an hover event to the notice at hand.
2010-02-16 17:36:45 +01:00
Sarven Capadisli
385fb94723
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-16 17:10:24 +01:00
Sarven Capadisli
3b8d060c29
Fix to allow any notice item with an attachment to use the overlay view
2010-02-16 17:09:34 +01:00