Evan Prodromou
db9e57f761
ensure from an RSS channel
2010-03-19 15:50:06 -05:00
Evan Prodromou
5092f98c0d
return empty hints if no hcard in the html
2010-03-19 15:28:06 -05:00
Evan Prodromou
1e03968d91
define a 'root' attribute for the channel or feed
2010-03-19 15:23:30 -05:00
Brion Vibber
b97400bd6f
clarify output on fixup-shadow.php
2010-03-19 11:17:56 -07:00
Brion Vibber
3d1c99c258
Merge branch 'ostatus-crop' of git@gitorious.org:~brion/statusnet/brion-fixes into 0.9.x
2010-03-19 10:27:03 -07:00
Brion Vibber
d2e6664132
Validate OStatus avatar URL before fetching.
2010-03-19 10:16:12 -07:00
Brion Vibber
9e3e1d3d56
Validate OStatus avatar URL before fetching.
2010-03-19 10:15:00 -07:00
Evan Prodromou
ac609e8040
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
...
Conflicts:
plugins/OStatus/extlib/hkit/hkit.class.php
plugins/OStatus/lib/discoveryhints.php
2010-03-18 20:57:38 -05:00
Evan Prodromou
17c50f338c
Remove hkit and do our own hcard parsing
...
Parsing hcards for the data we need wasn't hard enough to justify using
hkit. It was dependent on a number of external systems (something to
run tidy), and only could handle XHTML.
We now parse HTML with the PHP dom libraries used elsewhere, and
scrape out our own hcards. Seems to work nicer and faster and most of
all works with Google Buzz profile URLs.
2010-03-18 20:52:00 -05:00
Brion Vibber
4a6c9e4451
Work around weird bug with HTML normalization via PHP DOM module; if source had xmlns and xml:lang I ended up with double output, breaking the subsequent parsing. Will have to track this down later and report upstream if not already resolved.
2010-03-18 17:57:58 -07:00
Brion Vibber
08faff2278
Work around weird bug with HTML normalization via PHP DOM module; if source had xmlns and xml:lang I ended up with double output, breaking the subsequent parsing. Will have to track this down later and report upstream if not already resolved.
2010-03-18 17:55:21 -07:00
Brion Vibber
3e2e88b0df
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-18 17:19:28 -07:00
Brion Vibber
1301877dfe
OStatus discover fixes:
...
* Subscription::start was sometimes passing users instead of profiles to hooks, which broke OStatus subscription notifications; now normalizing to profiles for processing.
* H-card parsing would trigger a lot of PHP warnings and notices in hKit. Now suppressing warnings and notices for the duration of the call to keep them out of output when display_errors is on.
* H-card parsing would trigger a PHP fatal error if the source page was not well-formed XML and Tidy was not present on the system. Switched normalization to use the PHP DOM module which is always present, as we have no need for Tidy's extra features here.
* Trying to fetch avatars from Google profiles failed and triggered a PHP warning due to the relative URL not being resolved during h-card parsing. Now passing profile page URL into hKit by sneaking a <base> tag in while we normalize the HTML source.
* Profile pages without a "Link" header could trigger PHP notices due to a bad NULL -> array(NULL) conversion in LinkHeader::getLink(). Now checking that there was a return value before converting single return value into array.
2010-03-18 17:08:19 -07:00
Brion Vibber
c8e3d08a8f
Fix notice warning about unused var -- was renamed during refactoring.
2010-03-18 15:11:25 -07:00
Brion Vibber
cac9d23498
Fix for xmpp/sms notification options appearing to be disabled on new subscriptions.
...
Base problem is that our caching-on-insert interferes with relying on column default values; the cached object is missing those fields, so they appear to be empty (null) when the object is retrieved from cache.
Now explicitly setting them when inserting subscriptions, and cleaned up some code that had alternate code paths.
May also have made auto-subscription work for remote OStatus subscribers, but can't test until magic sigs are working again.
2010-03-18 14:26:32 -07:00
Brion Vibber
f1b3d84b7d
Fix some remote subscription regressions from f21f78364a
...
Ostatus_profile::ensureProfile() has been renamed to Ostatus_profile::ensureProfileURL()
2010-03-18 13:13:57 -07:00
Brion Vibber
1de7badd78
Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing
2010-03-18 10:55:20 -07:00
Sarven Capadisli
052466ceab
Using … (hellip) instead of "more" for link text
2010-03-18 14:26:30 +01:00
Evan Prodromou
a764603e73
reverse order from delete, insert to insert, delete on ostatus conversion
2010-03-18 08:04:22 -05:00
Evan Prodromou
f1af583e3e
catch exceptions in OStatus updates, log, and continue
2010-03-18 07:55:14 -05:00
Sarven Capadisli
d8a533274f
Updated 'more' anchor for attachments to do an XHR GET
2010-03-18 00:19:32 +01:00
Brion Vibber
dc71833ce6
Add doc comments on saveHTMLFile; drop the extra <div> wrapping the contents to make it easier to extract without getting extra markup.
2010-03-17 15:49:10 -07:00
Brion Vibber
a9c731798e
Tweak to OStatus long message cropping: use original source notice URL for the link in the text version, don't shorten the link for the HTML so we can append params to it in JS.
2010-03-17 14:16:43 -07:00
Brion Vibber
3a72c70b7e
When too-long messages come in via OStatus, mark the attachment link up as a "more" link in the HTML output, marked with class="attachment more" so JS code can fold it out smartly. Text output will still include the raw link.
2010-03-17 12:34:35 -07:00
Brion Vibber
67f2f01c5e
Merge branch 'testing' into 0.9.x
2010-03-17 12:15:40 -07:00
Evan Prodromou
4761c07ad8
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-17 09:38:39 -05:00
Evan Prodromou
f21f78364a
Change the workflow to get better discovery
...
Tried to re-structure the workflow of discovery to get more and richer
data and hints.
2010-03-16 11:25:18 -05:00
Brion Vibber
2b684f6954
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-15 14:39:14 -07:00
Brion Vibber
dfac4bfd09
Fix feed discovery: html:link@rel can contain multiple values; saw rel="updates alternate" in the wild at http://tantek.com/ which broke old discovery code.
2010-03-15 20:26:42 +00:00
Brion Vibber
c9232d8f26
Ticket #2242 : fix reading of inline XHTML content in Atom feeds for OStatus input.
...
Lookup of the <div> needed to check for the XHTML namespace.
2010-03-15 20:21:55 +00:00
Brion Vibber
c89e1865f7
Merge branch 'testing' into 0.9.x
2010-03-15 12:45:38 -07:00
James Walker
7aa49b5e87
use canonical user url in xrd
2010-03-15 15:17:31 -04:00
James Walker
85cf90cf0f
Performing & allowing host-meta discovery by http url (in addition to webfinger acct)
2010-03-13 18:35:00 -05:00
James Walker
99ca84e68e
changing keypair to text to hold a full 1024bit keypair
2010-03-13 15:46:54 -05:00
Brion Vibber
56402597dd
Throw a quick button label into ostatus .po file for french to test with
2010-03-13 12:19:07 -08:00
James Walker
9111c5c6fe
allow profile_url to be used in ostatus:attention
2010-03-13 14:36:51 -05:00
James Walker
135c0c8a7f
cleaning up key generation
2010-03-12 21:44:18 -05:00
James Walker
4e44cf906b
converting key generation to new crypt library
2010-03-12 20:02:00 -05:00
James Walker
520faaf67d
updating phpseclib to latest cvs - fixes a bunch of key generation issues
2010-03-12 20:01:34 -05:00
James Walker
c5bb41176e
converted toString to new crypt library
2010-03-12 19:42:48 -05:00
James Walker
23d44c7d59
converted sign, verify and fromString to new crypt lib
2010-03-12 19:34:45 -05:00
James Walker
41d2ff662c
Adding Crypt library from http://phpseclib.sourceforge.net/
2010-03-12 19:34:24 -05:00
James Walker
114f046691
removing deprecated PEAR Crypt_RSA
2010-03-12 18:50:00 -05:00
Brion Vibber
9e9ab23e1f
Fixes for updating indices, charset/collation and engine type on plugin-created tables.
...
Under MySQL, new tables will be created as InnoDB with UTF-8 (utf8/utf8_bin) same as core tables.
Existing plugin tables will have table engine and default charset/collation updated, and string columns will have charset updated, at checkschema time.
Switched from 'DESCRIBE' to INFORMATION_SCHEMA for pulling column information in order to get charset. A second hit to INFORMATION_SCHEMA is also needed to get table properties.
Indices were only being created at table creation time, which ain't so hot. Now also adding/dropping indices when they change.
Fixed up some schema defs in OStatus plugin that were a bit flaky, causing extra alter tables to be run.
TODO: Generalize this infrastructure a bit more up to base schema & pg schema classes.
2010-03-12 13:16:32 -08:00
Sarven Capadisli
4c320872d9
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-11 16:39:07 -05:00
James Walker
512e511053
fix invalid separator in magic-public-key XRD and matching parsing.
2010-03-11 14:49:12 -05:00
James Walker
06612e35e4
remove hard-coded me:env check in magicenvelope
2010-03-11 14:49:12 -05:00
James Walker
89582e7226
base64_encode/decode -> base64_url_encode/decode
2010-03-11 14:49:12 -05:00
Brion Vibber
c6f09306b1
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-10 17:04:51 -08:00
Brion Vibber
66518df435
OStatus: reject attempts to create a remote profile for a local user or group.
...
Some stray shadow entries were ending up getting created, which would steal group posts from remote users.
Run plugins/OStatus/scripts/fixup-shadow.php for each site to remove any existing ones.
2010-03-10 17:00:05 -08:00
Brion Vibber
8bf1b54abd
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-09 13:07:52 -08:00
Brion Vibber
32532c7c42
Merge branch 'commands' into testing
2010-03-09 13:05:51 -08:00
Brion Vibber
80a17387bf
Command input processing now has centralized places for looking up notice, user/profile, and group arguments.
...
OStatus plugin overrides these to allow using webfinger (user@example.com ), profile URL (http://example.com/user ) and bare profile URL (example.com/user) as arguments.
2010-03-09 13:03:32 -08:00
Brion Vibber
6c4ade4251
Merge branch 'testing' into 0.9.x
2010-03-09 11:27:53 -08:00
Brion Vibber
58192ad687
OStatus: fix exception thrown on HTTP error during feed discovery
2010-03-09 10:56:33 -08:00
James Walker
7214db14fe
wrong param order to strpos()
2010-03-09 01:24:21 -05:00
Brion Vibber
42463e160d
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-08 13:37:45 -08:00
Brion Vibber
89e313e45b
OStatus fix: send the feed's root element, not the DOM document, down to low-level feed processing as entry context on PuSH input.
2010-03-05 10:55:07 -08:00
Brion Vibber
2f41e93339
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-04 14:44:38 -08:00
Sarven Capadisli
a4ec64ff45
Slight right alignment for remote button in minilists
2010-03-04 13:43:28 -05:00
Brion Vibber
7bd0b8e17e
Pull latest .po files from 0.9.x to testing
2010-03-04 10:20:10 -08:00
Brion Vibber
f969d6349c
Merge branch 'testing' into 0.9.x
...
Conflicts:
db/08to09.sql
2010-03-04 10:16:59 -08:00
Brion Vibber
8f1762cb95
OStatus: fix for remote group join via non-logged-in 'join' button.
...
Bad lookup was sending us to the first group instead of the selected group.
2010-03-04 09:24:47 -08:00
James Walker
45f11d9637
adding plugin version to OStatus
2010-03-04 12:02:44 -05:00
Brion Vibber
b218aee94e
Merge commit 'origin/testing' into 0.9.x
...
Conflicts:
lib/action.php
lib/adminpanelaction.php
2010-03-04 06:07:28 -08:00
James Walker
ddc4a7d2ff
Catch a previously uncaught exception and add some additional debug logs for signature verification
2010-03-04 01:46:34 -05:00
James Walker
9cbeac5695
Merge remote branch 'statusnet/testing' into testing
2010-03-04 01:31:19 -05:00
James Walker
849f5783c4
update xrd -> userxrd
2010-03-04 01:30:15 -05:00
Sarven Capadisli
b97ac60209
Changed text for authorizing/confirming remote profile
2010-03-03 23:47:27 -05:00
Sarven Capadisli
f54fa6b10b
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-03 23:36:05 -05:00
Sarven Capadisli
38503096d9
Puts All groups and Remote sub button in the mini list on the same line
2010-03-03 23:34:48 -05:00
James Walker
1c8399fde1
refactor xrd to allow for ownerxrd - xrd document for the site owner.
...
introduced $config['webfinger']['owner'] for a custom xrd subject
2010-03-03 23:20:30 -05:00
Sarven Capadisli
239750aa00
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-03 22:58:28 -05:00
Sarven Capadisli
de687d00c0
Updated OStatus subscription error messages to be more user friendly.
...
Hopefully.
2010-03-03 22:56:50 -05:00
Brion Vibber
24835c1164
OStatus: catchable exception instead of fatal when parsing valid XML that isn't a valid XRD doc
2010-03-03 18:31:35 -08:00
Brion Vibber
14065ca350
OStatus: code cleanup on webfinger fallback path
2010-03-03 18:28:39 -08:00
Brion Vibber
a4d9171306
Fix up catching of webfinger setup fails
2010-03-03 18:23:28 -08:00
Sarven Capadisli
6a5a629afa
Updated label and note text for user and group remote subscribe forms
2010-03-03 20:08:55 -05:00
Brion Vibber
9fadf8da11
Put all required field setup into AtomUserNoticeFeed and AtomGroupNoticeFeed, consolidating some code. (RSS feeds pulling title, logo etc from the Atom data structure so we don't dupe it.)
...
OStatus now calling the feed classes directly instead of faking a call into the API, should be less flakey.
2010-03-03 16:33:20 -08:00
Sarven Capadisli
b3969be85a
Updated remote subscribe button style in aside
2010-03-03 17:48:00 -05:00
Brion Vibber
628338265c
OStatus: fix up remote join button on group profiles
2010-03-03 14:06:05 -08:00
Brion Vibber
4bad176088
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-03 13:41:00 -08:00
Brion Vibber
a42d1116db
Separate the UI paths for ostatussub and ostatusgroup. They'll redirect to each other transparently if they find you've put a remote entity of the other type.
2010-03-03 13:40:26 -08:00
Sarven Capadisli
219e15ac64
Returning true instead for group remote subscription. If not logged
...
in, it gives the chance to use the logged in join/leave instead.
2010-03-03 16:26:02 -05:00
Sarven Capadisli
d3c1888256
Generalized style for remote subscription button
2010-03-03 15:31:16 -05:00
Sarven Capadisli
3c55edde39
Showing the remote subscribe button on the user groups page
2010-03-03 15:30:43 -05:00
Evan Prodromou
ccd0db1e0a
add remote subscribe button for not-logged-in users looking a profile list with local users in it
2010-03-03 14:32:03 -05:00
Sarven Capadisli
023b9bb00f
Renamed subscribe button from New to Remote since it only does remote
...
subscriptions at the moment.
2010-03-03 13:30:14 -05:00
Sarven Capadisli
7d7847295a
Using position relative only for the remote subscription in section
2010-03-03 13:17:00 -05:00
Sarven Capadisli
2c9887bce5
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-03 12:57:03 -05:00
Sarven Capadisli
c8bdf3cacb
Added group subscription button to groups mini list
2010-03-03 12:56:19 -05:00
Brion Vibber
f3cea24304
Fix for hcard parsing: typo caused notice spew accessing unset array index
2010-03-03 09:36:26 -08:00
Brion Vibber
9801c60bea
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-03 09:33:38 -08:00
Brion Vibber
1e63fda669
Clean up OStatus mentions finding; separate regexes keeps the code paths a bit clearer. Also switched to hitting HTTP profile first; as the common case it'll be faster.
2010-03-03 09:32:25 -08:00
Brion Vibber
ffa1931c9d
Avoid warning/notice spew in XRD parser. Not all DOM nodes are elements.
2010-03-03 09:31:14 -08:00
Sarven Capadisli
11750e832f
Added remote join action for group profile
2010-03-03 12:02:10 -05:00
Sarven Capadisli
ea10805e3f
Moved the remote subscription button to subscription mini list
2010-03-03 11:22:21 -05:00
Sarven Capadisli
1a4652b1ad
Changed label text for remote subscription to something similar. Given
...
that this button will be used within context of subscriptions, 'New'
works along with the '+' icon.
2010-03-03 10:32:54 -05:00
Brion Vibber
79ffebb51b
OStatus: save file records for enclosures
...
Also stripping id from foreign HTML messages (could interfere with UI) and disabled failing attachment popup for a.attachment links that don't have a proper id, so you can click through instead of getting an error.
Issues:
* any other links aren't marked and saved
* inconsistent behavior between local and remote attachments (local displays in lightbox, remote doesn't)
* if the enclosure'd object isn't referenced in the content, you won't be offered a link to it in our UI
2010-03-02 16:36:08 -08:00
Brion Vibber
ddf3614c84
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-02 13:38:10 -08:00
Sarven Capadisli
1550d1004d
Don't need to float the anchor
2010-03-02 15:24:07 -05:00
Sarven Capadisli
e3c2b8e0b5
Refactored remote subscribe action in OStatus
2010-03-02 12:41:18 -05:00
Sarven Capadisli
88c33bbb57
Showing remote subscription button on the personal timeline
2010-03-02 12:35:27 -05:00
Sarven Capadisli
5abff91041
Generalized style for entity remote subscription action
2010-03-02 12:34:35 -05:00
Sarven Capadisli
623faf9f2d
Just a label change. Since the user already went ahead with
...
subscribing, in this step we are just confirming the profile.
2010-03-02 09:57:28 -05:00
Brion Vibber
680ace1966
High-priority OStatus fixes:
...
* PuSHing out to multiple client services could fail; only first callback got reached
* Correction for re-sub request to a known sub
2010-03-01 18:46:34 -08:00
Brion Vibber
e30af99873
Merge branch 'work' into testing
2010-03-01 16:57:58 -08:00
Brion Vibber
493b5479c1
OStatus: support @example.com/path/to/profile mentions as well as @profile@example.com (latter requires webfinger, former doesn't)
...
Plus misc warnings/notices cleanup in the submission path.
2010-03-01 16:43:36 -08:00
Brion Vibber
45e8819c1b
Fix a bunch of notice & warning-level messages that were breaking my inter-instance communications
2010-03-01 16:35:36 -08:00
Evan Prodromou
0512151eab
more output in updateostatus.php
2010-03-01 18:19:20 -05:00
Evan Prodromou
d77248343f
fix path for updateostatus.php
2010-03-01 18:03:17 -05:00
Evan Prodromou
3ff3abb247
Script to convert OMB subscriptions to OStatus subscriptions
2010-03-01 18:03:17 -05:00
Brion Vibber
3c4ead4996
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
...
Conflicts:
db/08to09.sql
locale/statusnet.po
scripts/update_po_templates.php
2010-03-01 14:59:26 -08:00
Brion Vibber
00f724d0e6
Localization tweak: include doc comments marked as 'TRANS' in .po file output; these should now get automatically pulled through to the TranslateWiki interface as translator help hints.
2010-03-01 14:10:13 -08:00
Evan Prodromou
f00e8bbf47
Merge branch 'testing' into 0.9.x
2010-02-27 17:07:57 -05:00
James Walker
831eb0d2b6
renaming sha256 to prevent conflict
2010-02-26 18:27:13 -05:00
James Walker
ee7603b09f
better return check in Magicsig::staticGet()
2010-02-26 17:53:27 -05:00
James Walker
1cf08c7ad7
MagicEnvelope::parse shouldn't be called statically
2010-02-26 17:09:50 -05:00
James Walker
6ee7660a58
should be sequenceKey (singular)
2010-02-26 16:51:50 -05:00
James Walker
0ecf435dc5
adding sequenceKeys() to magicsig
2010-02-26 16:50:00 -05:00
James Walker
c82cee1876
removing some extraneous debug logging
2010-02-26 16:26:04 -05:00
James Walker
e4c462570f
move salmon posting to send application/magic-envelope+xml per http://salmon-protocol.googlecode.com/svn/trunk/draft-panzer-salmon-00.html#RPF
2010-02-26 15:39:58 -05:00
James Walker
f23a877cd8
Discovery::lookup now throws an exception
2010-02-26 15:39:58 -05:00
Brion Vibber
9b366547d7
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
2010-02-26 12:33:50 -08:00
James Walker
223ebc765c
move signing to take a local actor profile and use local keys
2010-02-26 14:22:49 -05:00
James Walker
3a7eef1074
only put public keys in XRD
2010-02-26 14:22:49 -05:00
James Walker
bbb0a7d5bc
updating to use latest salmon NS definitions
2010-02-26 14:22:49 -05:00
Brion Vibber
8dfc8f1635
Merge branch 'testing' into 0.9.x
2010-02-26 09:35:28 -08:00
James Walker
ab8bb4d79e
more cleanup
2010-02-26 04:07:58 -05:00
James Walker
d1256b547f
bad merge.. cleaning up missing webfinger bits
2010-02-26 03:43:35 -05:00
James Walker
22062b665e
remove webfinger.php
2010-02-26 03:28:29 -05:00
James Walker
84d0c865c4
salmon actually fetching remote keypairs
2010-02-26 03:25:51 -05:00
James Walker
7c8031dc4b
Merge remote branch 'statusnet/testing' into testing
...
Conflicts:
plugins/OStatus/lib/webfinger.php
2010-02-25 23:49:45 -05:00
James Walker
855692141d
use a real keypair from discovery
2010-02-25 23:38:25 -05:00
James Walker
0afb09ad64
er. right.
2010-02-25 23:37:59 -05:00
Brion Vibber
02300ebfb0
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
2010-02-25 19:52:19 -08:00
Brion Vibber
2528bb452b
OStatus: clean up known-URL hinting during profile setup, saves some extra HTTP hits we were getting when mentioning Buzz feeds.
2010-02-25 19:50:59 -08:00
Zach Copley
cf61f36e6b
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
...
* 'testing' of gitorious.org:statusnet/mainline:
OStatus: pull best-sized avatar image (96x96 if found, otherwise largest, otherwise if none labeled takes the first)
info about discovery in Ostatus_profile::ensureWebfinger()
cache Web responses in Webfinger library
2010-02-25 18:57:12 -08:00
Zach Copley
d8d8d59a03
- Updates to use new activity object factories
...
- Prune obsolete feed creation method
2010-02-25 18:55:11 -08:00
Brion Vibber
2fa953da22
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
2010-02-25 18:52:26 -08:00
Brion Vibber
2feb09f434
OStatus: pull best-sized avatar image (96x96 if found, otherwise largest, otherwise if none labeled takes the first)
2010-02-25 18:51:44 -08:00
Evan Prodromou
e197208a4a
info about discovery in Ostatus_profile::ensureWebfinger()
2010-02-25 21:07:52 -05:00
Evan Prodromou
a43598c31e
cache Web responses in Webfinger library
2010-02-25 21:07:24 -05:00
Evan Prodromou
c693365ae7
cache results of webfinger lookups
2010-02-25 20:29:52 -05:00
Evan Prodromou
1cae324555
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-25 19:59:01 -05:00
Evan Prodromou
894b221e8a
Parse an hcard for hints, if available
2010-02-25 19:58:51 -05:00
Evan Prodromou
cc0670791e
use new hcard method for webfinger
2010-02-25 19:58:18 -05:00
Evan Prodromou
36f02f459b
add hkit for hCard parsing
2010-02-25 19:11:39 -05:00
Zach Copley
82cac2be59
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
...
* 'testing' of gitorious.org:statusnet/mainline:
OStatus: if no <link> available and no profileurl hint passed in, use object id if it's an HTTP(S) URL. Fixes profile link for Google accounts.
Tweak common_url_to_nickname to take the last path component; fixes pulling nicks from Google profile pages (path is "/profile/<nickname>")
Fix bug on subscribe/unsubscribe in profile lists. Bogus call to nonexisting profile->getProfile() was masked by DB_DataObject
2010-02-25 16:07:32 -08:00
Zach Copley
7922edb5b6
Add lots of fun avatars to our Atom output
2010-02-25 16:06:49 -08:00
Brion Vibber
45435a7c03
OStatus: if no <link> available and no profileurl hint passed in, use object id if it's an HTTP(S) URL. Fixes profile link for Google accounts.
2010-02-26 00:01:22 +00:00
Evan Prodromou
4aa82f75ed
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-25 18:45:32 -05:00
Evan Prodromou
6578e0e1af
use new dedicated hcard method for Webfinger profile
2010-02-25 18:45:08 -05:00
James Walker
08413428a7
typo
2010-02-25 17:52:56 -05:00
James Walker
93f4f07c12
moving webfinger action to xrdaction
2010-02-25 17:52:18 -05:00
James Walker
5ae64a7adb
moving references to Webfinger to Discovery
2010-02-25 17:34:56 -05:00
James Walker
bd90ef9f66
replace webfinger usage in hostmeta.php
2010-02-25 17:26:10 -05:00
James Walker
b2dabe6a48
removing the webfinger lib
2010-02-25 17:12:46 -05:00
James Walker
3d0ba3efc8
adding a new, more generic "discovery" class that does LRDD disco
...
(rather than webfinger specific)
2010-02-25 17:09:54 -05:00
James Walker
5cb6e54bed
call-time pass by reference
2010-02-25 17:09:54 -05:00
James Walker
e62e49ed3b
adding some exception handling for magicenv parsing
2010-02-25 17:09:54 -05:00
Brion Vibber
b5b5184c88
OStatus: fix remote groups to work with new user_groups/local_groups split.
...
- fix <activity:subject> generation so we get the profile info (what's available so far)
- use id instead of nickname for group join/leave forms so we can join/leave remote groups
while the rest of the groups UI remains limited to local groups
(plugins are responsible for making sure remote notifications and permission checks are done)
- fix remote notification when joining group through OStatus's remote subscribe form
2010-02-25 13:02:08 -08:00
Brion Vibber
79c0d52daa
OStatus: save categories from the Atom entry as hashtags.
2010-02-25 11:26:33 -08:00
Evan Prodromou
374c488cf1
return attachement from saveHTMLFile()
2010-02-24 22:26:40 -05:00
Evan Prodromou
b08a527139
content_* to common_*
2010-02-24 22:22:42 -05:00
Evan Prodromou
75cf4d4312
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-24 22:03:01 -05:00
Evan Prodromou
942521ef30
if OStatus post is too long, show the summary and save it as an HTML attachment
2010-02-24 22:02:43 -05:00
Brion Vibber
58e232a10a
OStatus: when finding webfinger @-replies, override a local profile match if found at the same location (eg @someguy vs @someguy@example.org)
...
Fixes inconsistent application of webfinger @-mentions in OStatus; once a local profile is set up the local name would often match first and ended up overriding in output.
2010-02-25 02:56:56 +00:00
Brion Vibber
b798faf9ea
OStatus: abort processing of this PuSH in item if we got an exception, rather than letting it be re-run.
2010-02-25 02:43:20 +00:00
Zach Copley
10884dcd49
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
...
* 'testing' of gitorious.org:statusnet/mainline:
Merge StatusNet core localization updates from 0.9.x branch
Fix update_po_templates.php to support the plural and context variants of _m() in plugins
Drop HTMLPurifier; we don't need its extra capabilities and we're already using htmLawed which is lighter-weight.
OStatus: handle update-profile Salmon pings
Revert "Updated jQuery Form Plugin from v2.17 to v2.36"
OStatus: disable HTMLPurify cache unless we've configured a writable path for it.
2010-02-24 16:52:16 -08:00
Zach Copley
543ff40ef6
Populate more profile information when doing a remote subscribe
2010-02-24 16:51:24 -08:00
Brion Vibber
59be4b8cae
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
2010-02-24 15:47:51 -08:00
Brion Vibber
e18e659ca3
Drop HTMLPurifier; we don't need its extra capabilities and we're already using htmLawed which is lighter-weight.
2010-02-24 23:39:40 +00:00
Brion Vibber
93507a1927
OStatus: handle update-profile Salmon pings
2010-02-24 23:28:01 +00:00
Brion Vibber
ec4899e617
OStatus: disable HTMLPurify cache unless we've configured a writable path for it.
...
Updated plugin README with available config options.
Cleanup for a bad element fallback lookup in Activity
2010-02-24 22:16:17 +00:00
Brion Vibber
0c7844734e
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-24 20:38:38 +00:00
Brion Vibber
c36bdc1ba5
- break OMB profile update pings to a background queue
...
- add event hooks to profile update pings
- send Salmon pings with custom update-profile event to OStatus subscribees and groups (subscribers will see it on your next post)
- fix OStatus queues with overlong transport names, should work on DB queues now
- Ostatus_profile::notifyActivity() and ::notifyDeferred() now can take XML, Notice, or Activity for convenience
2010-02-24 20:36:36 +00:00
Evan Prodromou
269d567d94
use Subscription::start() for remote subscribes
2010-02-24 15:20:06 -05:00
Evan Prodromou
daea988786
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-24 15:00:52 -05:00
Brion Vibber
07214f1370
OStatus: save updated profile bits when they come in over the wire; fix up nicknames
2010-02-24 19:06:10 +00:00
Sarven Capadisli
1f45273d53
Moved StatusNetInstance into SN in util.js
2010-02-24 16:35:20 +01:00
Sarven Capadisli
8e7606cc8d
Added processing indicator for .form_remote_authorize on ostatussub page
2010-02-24 15:20:44 +01:00
Zach Copley
618ce6a855
- Move ActivityParseTests to core
...
- Add test for Portable Contacts stuff
2010-02-23 23:58:21 -08:00
Brion Vibber
2e58802cc9
OStatus: fix group delivery, send reply/group Salmon pings from background.
2010-02-24 02:20:31 +00:00
Brion Vibber
584b87cfe5
OStatus: consolidate the low-level notice save code between Salmon and PuSH input paths. Validation etc remains at higher levels.
2010-02-24 01:09:52 +00:00
James Walker
391b45949f
adding xfn, foaf and hcard rel's to our webfinger output
2010-02-23 18:25:31 -05:00
Brion Vibber
d6ad733247
OStatus: fixes for link/id and text extraction gets import of Buzz feeds working.
2010-02-23 21:47:14 +00:00
Evan Prodromou
f5ec7c2707
some logging for OStatusPlugin::onStartFindMentions()
2010-02-23 16:13:24 -05:00
Brion Vibber
5f9a8ca64b
OStatus: accept webfinger addresses as well as profile URLs in the explicit remote subscribe form.
2010-02-23 21:11:44 +00:00
Evan Prodromou
b09304a6c4
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
...
Conflicts:
plugins/OStatus/OStatusPlugin.php
2010-02-23 16:02:27 -05:00
Evan Prodromou
a0c255e231
move mention detection before default in OStatusPlugin
2010-02-23 15:59:10 -05:00
Brion Vibber
90d34b26c6
OStatus: do PuSH subscription setup from subscribe/join event hooks, so resubscribing directly from a profile/group list works correctly if there aren't active subscriptions at the moment.
2010-02-23 20:44:27 +00:00
Brion Vibber
c79c70ea2c
OStatus subscription UI tweak: if we're already subscribed/joined, say so and don't offer a 'subscribe'/'join' button on the profile preview page.
2010-02-23 11:56:17 -08:00
Brion Vibber
e070fcaaae
OStatus: fix for avatars, submit button in updated remote profile preview
2010-02-23 11:37:49 -08:00
James Walker
1fe031844c
er typo
2010-02-22 23:44:33 -05:00
James Walker
9494b0e5d7
magicsig shuffling
2010-02-22 23:30:32 -05:00
James Walker
17b8020d25
clean up error logging
2010-02-22 23:30:31 -05:00
James Walker
cd561657c2
missing return value check
2010-02-22 23:30:31 -05:00
James Walker
f4b34d67c5
generate keypairs for users, and put them in the XRD for discovery
2010-02-22 23:30:31 -05:00
James Walker
74f5c1e169
db_objectified magic sig - for persistence of local keypairs
2010-02-22 23:30:31 -05:00
James Walker
cb32b676fa
moving magicsig.php to classes - to add storage
2010-02-22 23:30:31 -05:00
Sarven Capadisli
b67bb182b0
Refactored preview info and form for authorizing a remote subscription
2010-02-23 04:59:34 +01:00
Brion Vibber
193448d1be
OStatus: cleanup on ostatussub preparing for final UI work on the remote sub/join forms.
2010-02-23 01:58:05 +00:00
Zach Copley
cbf6ebae01
Merge branch 'rationalize-activity' into testing
...
* rationalize-activity:
Move ActivityObject and related stuff to core
Add PoCo bits, avatar link, geo point, etc. to person activity obj output
2010-02-22 17:12:33 -08:00
Zach Copley
6a711c6cdc
Move ActivityObject and related stuff to core
2010-02-22 17:10:50 -08:00
Brion Vibber
870e556faa
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-23 00:52:47 +00:00
Zach Copley
a3e800e67c
Add PoCo bits, avatar link, geo point, etc. to person activity obj output
2010-02-22 16:46:54 -08:00
Brion Vibber
d410df0406
OStatus group delivery initial implementation.
...
- added rel="ostatus:attention" links for group delivery
- added events for plugins to override group profile/permalink pages
- pulled Notice::saveGroups up to save-time so we can override;
it's relatively cheap and gives us a clean list of target
groups for distrib time even with customized delivery.
- fixed notice::getGroups to return group objects as expected
- added some doc on new parameters to Notice::saveNew
- 'groups' list of group IDs to push to in place of parsing
- messages that come in via PuSH and contain local group targets
are delivered to local group members
- messages that come in via PuSH and contain remote group targets
are delivered to local members of the remote group
Todo:
- handle group posts that only come through Salmon
- handle conflicts in case something comes in both through Salmon and PuSH
- better source verification
- need a cleaner interface to look up groups by URI
- need a way to handle remote groups with conflicting names
2010-02-23 00:44:45 +00:00
James Walker
caad5859b5
swapping pear error handling so Crypt_RSA can properly detect available
...
math libraries
2010-02-22 19:01:12 -05:00
Sarven Capadisli
3b823f8fbd
Leaves the original URL alone and adds ? or & when it does the XHR.
2010-02-23 00:27:41 +01:00
Sarven Capadisli
8aa8e124cb
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-22 22:24:45 +01:00
Sarven Capadisli
3c00472999
Removed unnecessary assignment to SN.C.I.OStatusProfile. It can be
...
brought back in the future if the value is to be set directly from the
HTML script output.
2010-02-22 22:23:37 +01:00
Brion Vibber
06f155c02d
OStatus: initial hookup of remote group membership (notice delivery not yet working quite right)
...
- added a temp config var to disable salmon magic signatures until they're working consistently
2010-02-22 12:13:57 -08:00
Sarven Capadisli
7e8c3ea418
Removed extra comma
2010-02-22 19:37:42 +01:00
Sarven Capadisli
a1549ebf87
Minor JSLinting
2010-02-22 19:36:03 +01:00
Sarven Capadisli
3ed3796135
Added licensing info and a note about migrating
2010-02-22 19:18:32 +01:00
Sarven Capadisli
85cb850cd5
Set and reuse a cookie with own profile value at a StatusNet instance
2010-02-22 19:13:30 +01:00
Brion Vibber
2b16532ffb
OStatus: use 'profile' consistently as param on ostatussub and ostatusinit to help us stay sane.
2010-02-22 10:03:34 -08:00
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
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
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
Brion Vibber
5a6cbb248f
Merge branch 'testing' into 0.9.x
2010-02-17 10:14:08 -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
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
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
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
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
Evan Prodromou
201110ffaa
restructure Activity classes to push more DOM stuff to ActivityUtils
2010-02-16 12:49:54 -05:00
Evan Prodromou
813451c9f9
add a couple of FIXME comments
2010-02-16 10:18:23 -05:00
Evan Prodromou
5a357d5399
change find() to staticGet() to use cache
2010-02-16 09:58:33 -05:00
Evan Prodromou
73e2264c6a
test parsing a default atom feed for activities
2010-02-14 13:19:32 -05:00
Evan Prodromou
f78cf31303
update activity and salmon for previous commit
2010-02-14 12:12:47 -05:00
Evan Prodromou
cea7d8018a
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-14 12:09:07 -05:00
Evan Prodromou
62f5c04ad2
More complete activity parsing
...
Began the process of actually digging up activity information
from an Atom entry. Added a test script to make sure parsing
is working right.
2010-02-14 12:08:09 -05:00
Sarven Capadisli
171bf3093a
Dialogbox for OStatus remote subscription
2010-02-13 20:28:05 +01:00
Sarven Capadisli
1cb94e0be6
Added dialogbox styles for OStatus subscribe form
2010-02-13 19:07:21 +01:00
Sarven Capadisli
4d050f96f3
Added XHR channel for OStatus Subscribe button
2010-02-13 18:49:14 +01:00
Sarven Capadisli
f30af7047b
Updated feed subscription form markup
2010-02-13 18:46:10 +01:00
Sarven Capadisli
24394269fa
Updated OStatus form markup
2010-02-13 18:44:41 +01:00
Sarven Capadisli
f6e766d5ac
Using the new remote subscription event and updated subscribe label
2010-02-13 18:42:00 +01:00
Zach Copley
f3a82e787c
Add OStatus PuSH hub and Salmon links back into user and group feeds
2010-02-12 19:02:27 -08:00
Brion Vibber
b39047d95b
OStatus: prep work for sending notifications on sub/unsub/join/leave/favorite/unfavorite via Salmon; needs to be completed and hooked up once feed gen is fixed.
2010-02-12 18:54:48 +00:00
Evan Prodromou
320532560f
flesh out salmon endpoint
2010-02-12 00:43:16 -05:00
Evan Prodromou
5f94efc454
stub for activities
2010-02-12 00:42:42 -05:00
Brion Vibber
bc46621af2
OStatus sub setup code cleanup and partial group fixes (needs more work after the Atom updates are done)
2010-02-12 01:11:46 +00:00
Brion Vibber
8e6b52e899
OStatus: renamed feedinfo table to ostatus_profile -- will cover remote ostatus people and groups whether a subscription's active or not (maintains identity over unsub/resub, and between subscribers and subscribees)
2010-02-12 00:22:16 +00:00
Brion Vibber
e08657d56c
OStatus: correct parsing of georss:point for max interop (commas allowed, whitespace not strictly defined)
2010-02-11 22:42:36 +00:00
Brion Vibber
1773d12a24
OStatus: save Salmon postback URI in feed subscription info, if provided. Will need it for sub/unsub postbacks and other notifications.
2010-02-11 20:12:48 +00:00
Brion Vibber
21bfbc43ad
OStatus: fix salmon link on Atom feeds; add a url spec for group feeds as well (endpoint needs impl)
2010-02-11 20:02:17 +00:00
Brion Vibber
20714d1f35
OStatus fix: include feed profile at notice text processing time, fixes replies
2010-02-11 19:44:03 +00:00
Brion Vibber
71151b2583
OStatus: garbage collect unused PuSH subscriptions when the last local subscriber unsubs
2010-02-11 00:09:20 +00:00
Brion Vibber
4ae760cb62
OStatus PuSH fixes:
...
* HMAC now calculated correctly - confirmed interop with Google's public hub
* Can optionally use an external PuSH hub, set URL in $config['ostatus']['hub']
(may have issues in replication environment, and will ping the hub for every
update rather than just those with subscribers) Internal hub will still function
when this is set, but won't be advertised. Warning: setting this, then turning
it off later will break subscriptions as that hub will no longer receive pings.
2010-02-10 22:58:39 +00:00
Brion Vibber
162868afdb
OStatus update: now using standard save/delivery for incoming ostatus messages -- they get reflected to realtime and everything! woooo
...
Group delivery may still need some munging
2010-02-10 21:18:53 +00:00
Brion Vibber
7752612ef6
fix hubdistrib
2010-02-10 20:47:42 +00:00
Brion Vibber
045797331c
fix up hub queueing to work w/ stomp queues
2010-02-10 12:27:41 -08:00
Brion Vibber
f37063cd63
Filename case fix
2010-02-10 10:18:47 -08:00
James Walker
f4ebac5036
removing the webfinger hack for Notice::asAtomEntry since salmon can use a profile URL
2010-02-09 21:50:51 -05:00
James Walker
46f90f7b08
moving salmon endpoint under 'main/'
2010-02-09 21:43:37 -05:00
Brion Vibber
8449256817
OStatus partial support for group subscriptions:
...
* detection of group feeds is currently a nasty hack based on presence of '/groups/' in URL -- should use some property on the feed?
* listing for the remote group is kinda cruddy; needs to be named more cleanly
* still need to establish per-author profiles (easier once we have the updated Atom code in)
* group delivery probably not right yet
* saving of group messages still triggering some weird behavior
Added support for since_id and max_id on group timeline feeds as a free extra. Enjoy!
2010-02-09 18:32:52 -08:00
James Walker
c2475f8853
in progress Salmon responses
2010-02-09 15:37:37 -05:00
James Walker
841981a381
discovery piece - hand merged :P
2010-02-09 01:37:45 -05:00
Brion Vibber
b9b0f0410a
Pull GeoRSS locations over OStatus feeds
2010-02-08 15:46:38 -08:00
Brion Vibber
384387c9b0
OStatus cleanup...
...
* Treat linkless feed posts as status updates; drop the "New post:" prefix and quotes on them.
* Use stable user IDs for atom/rss2 feed links instead of unstable nicknames
* Pull Atom feed preferentially when subscribing -- can now put the remote user's profile page straight into the feed subscription form and get to the right place.
* Clean up naming for push endpoints
2010-02-08 14:58:12 -08:00