Brion Vibber
5c00848b74
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
2010-11-15 12:38:53 -08:00
Brion Vibber
e317ec11ad
Drop PEAR Services_oEmbed -- ended up replaced by our oEmbedHelper wrapper. The extra validation available there is problematic, and their code for building HTML for us wasn't being used anyway.
2010-11-15 12:35:15 -08:00
Brion Vibber
727596f35d
Test oEmbed lookups with oohembed both on and off explicitly
2010-11-15 12:32:29 -08:00
Brion Vibber
68ff57f230
Restructure oembed test sources
2010-11-15 12:25:44 -08:00
Brion Vibber
87114a5c30
Add some basic oEmbed lookup test cases; fixed a bug in discovery fallback.
2010-11-15 11:55:28 -08:00
Brion Vibber
57ec01d0b8
Drop some debug lines
2010-11-15 11:30:35 -08:00
Brion Vibber
c8445299c7
Swap the Services_oEmbed wrapper in oEmbedHelper out for doing it ourselves...
...
- workaround for providers that are skimpy on their data, such as missing width/height or thumbnail_width/thumbnail_height
- workaround for YFrog listing "image" instead of "photo" type
- generally more lax about formatting: if it comes back and looks kinda ok, we'll take it.
- discovery uses system HTML parser, should be more robust if the links include things like ampersands with proper HTML-level escaping
2010-11-15 11:25:38 -08:00
Evan Prodromou
d038d0fa46
AtomPub-related actions are only read-only on GET
2010-11-15 14:14:09 -05:00
Brion Vibber
1c90d09ec8
Workaround for yfrog.com photo attachments: fudge File_redirection::lookupWhere()'s HTTP handling -- when we get a 204 on a HEAD, double-check it by re-running as a GET. yfrog.com returns a 204 incorrectly for this case.
2010-11-15 11:01:00 -08:00
Brion Vibber
e1ffbfed04
doc comments on File::processNew
2010-11-15 11:00:42 -08:00
Evan Prodromou
8a21b13ee9
Merge remote branch 'gitorious/0.9.x' into 0.9.x
2010-11-15 11:57:31 -05:00
Evan Prodromou
c1cee3b27f
Merge branch 'atompub' into 0.9.x
...
Conflicts:
actions/apistatusesshow.php
actions/apitimelineuser.php
2010-11-15 11:57:19 -05:00
Evan Prodromou
cb371d65c1
add hooks for atom pub posts
2010-11-15 11:54:42 -05:00
Brion Vibber
4f323efdf7
Encapsulate the oEmbed -> oohembed fallback into oEmbedHelper class. Also added a chance to whitelist sites that don't show discovery info but do have oEmbed API endpoints, and to provide alternate APIs for some common services.
...
Newly supported:
- TwitPic: added a local function using TwitPic's API, since the oohembed implementation for TwitPic produced invalid output which Services_oEmbed rejects. (bug filed upstream)
Tweaked...
- Flickr: works, now using whitelist to use their endpoint directly instead of going through oohembed
- Youtube: worked around a bug in Services_oEmbed which broke the direct use of API discovery info, so we don't have to use oohembed.
Not currently working...
- YFrog: whitelisting their endpoint directly as the oohembed output is broken, but this doesn't appear to work currently as I think things are confused by YFrog's servers giving a '204 No Content' response on our HEAD checks on the original link.
2010-11-12 17:41:35 -08:00
Brion Vibber
398e622fec
Save attached URLs when importing a Twitter status: this lets our thumbnail detection handle photos and videos linked to by Twitter posters.
2010-11-12 17:40:34 -08:00
Brion Vibber
2c33fdd2fb
Only use saved thumbnails for notice list attachment thumbs -- don't attempt to search enclosures for photo types. We now save thumbs directly for oEmbed photos that don't list a separate thumb entry (like Flickr), so it's not needed. Keeps things cleaner :D
2010-11-12 14:03:57 -08:00
Brion Vibber
2c4313467f
Save oEmbed photo references as thumbnails if there's not a separate thumbnail_url entry in the return data. This fixes thumb saving for Flickr photo references.
2010-11-12 14:03:08 -08:00
Brion Vibber
65eeb7cba5
Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x
...
Conflicts:
actions/newgroup.php
2010-11-12 13:32:48 -08:00
Brion Vibber
6291e8201f
Fix for failure edge case in TwitterBridge outgoing repeat/retweets.
...
When the retweet failed with a 403 error (say due to it being a private tweet, which can't be retweeted) we would end up mishandling the return value from our internal error handling.
Instead of correctly discarding the message and closing out the queue item, we ended up trying to save a bogus twitter<->local ID mapping, which threw another exception and lead the queue system to re-run it.
- Fixed the logic check and return values for the retweet case in broadcast_twitter().
- Added doc comments explaining the return values on some functions in twitter.php
- Added check on Notice_to_status::saveNew() for empty input -- throw an exception before we try to actually insert into db. :)
2010-11-12 13:06:41 -08:00
Brion Vibber
5d12ec0532
Merge branch 'oembed-thumbnails' into 0.9.x
2010-11-12 12:28:44 -08:00
Brion Vibber
cb124fe831
Add a quick config setting to disable/enable display of thumbnails in regular notice lists (attachments/show_thumbs) - disabling gives the same display as before this feature was added (but changes to oembed handling are still there, and the lightbox popup is gone)
2010-11-12 12:24:55 -08:00
Brion Vibber
cda59dc177
drop a comma which isn't actually an error but keeps throwing annoying warnings in netbeans
2010-11-12 12:10:51 -08:00
Brion Vibber
62467f51e5
Drop commented-out code from old lightbox & thumbnail popup stuff
2010-11-12 12:10:29 -08:00
Evan Prodromou
b6af5a25ba
don't try to initialize the mapstraction canvas if it doesn't exist
2010-11-12 11:48:17 -05:00
Evan Prodromou
fdf3a23da7
don't try to initialize the mapstraction canvas if it doesn't exist
2010-11-12 11:46:45 -05:00
Evan Prodromou
c4a8a6776e
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
2010-11-11 15:32:24 -05:00
Evan Prodromou
2d55bc0e5b
give users a chance to opt out of email summaries
2010-11-11 14:51:14 -05:00
Evan Prodromou
adb16b8098
fix update of email prefs in queue handler
2010-11-11 14:50:53 -05:00
Zach Copley
0ed572ff3f
Fix missing close of comment block
2010-11-11 10:39:05 -08:00
Zach Copley
09aaf21e8d
Fix missing close of comment block
2010-11-11 10:33:26 -08:00
Brion Vibber
fbd8052d05
Add error logging for a couple send-fail cases in XMPP out
2010-11-10 15:26:18 -08:00
Brion Vibber
46223da594
CSS class tweak for inline attachment thumbnails to avoid things thinking they're content links
2010-11-10 14:31:55 -08:00
Craig Andrews
cc0038d47c
Fix isHTTPS to work correctly for Cherokee and IIS
2010-11-10 15:53:20 -05:00
Brion Vibber
592e0bc505
add title attribute on attachment list items
2010-11-09 16:43:37 -08:00
Brion Vibber
5a3d01423d
Cleanup on the CSS for inline attachments; removed some unneeded changes since the split of the inline and regular attachment lists. Removing commented-out code that seems to be for some old thumbnailing system where the thumbnails were hidden popups within the core text (wtf!)
2010-11-09 16:28:33 -08:00
Evan Prodromou
3afb031d92
Missing one close-paren in newgroup.php
2010-11-09 17:08:11 -05:00
Evan Prodromou
a4654bfe9f
session table was missing from upgrade scripts
2010-11-09 15:09:00 -05:00
Brion Vibber
dbb95b76a4
Allow YouTube-style media links to be counted as enclosures for purposes of listing attachments/thumbs
2010-11-09 12:04:07 -08:00
Evan Prodromou
41a0f18301
Merge branch '0.9.x' into emailsummary
2010-11-09 15:01:07 -05:00
Evan Prodromou
a988e2e97b
hook points for the email settings form
2010-11-09 15:00:30 -05:00
Brion Vibber
f25accc43e
split out InlineAttachmentList from AttachmentList
2010-11-09 10:45:19 -08:00
Evan Prodromou
e87323e426
change width of notices table to display better
2010-11-09 13:04:11 -05:00
Evan Prodromou
9ea1a9c631
session table was missing from upgrade scripts
2010-11-09 12:53:57 -05:00
Evan Prodromou
17ab5c31ed
some alignment in the table layout
2010-11-09 07:04:50 -05:00
Evan Prodromou
76aed36f38
set height and width of avatar td in email summary
2010-11-09 06:59:16 -05:00
Brion Vibber
504529e8cd
Keep aspect ratio when generating local thumbnails
2010-11-08 17:51:53 -08:00
Brion Vibber
694448e0aa
Add attachments 'thumb_width' and 'thumb_height' settings for inline thumbs, defaulting to 100x75.
...
This is used as the max thumb width/height for oEmbed requests (replacing the old default of 500x400 which was more suitable for the lightbox).
2010-11-08 17:36:02 -08:00
Brion Vibber
6d7f02ff31
Pass file attachment thumbnails along with oEmbed data.
2010-11-08 17:22:01 -08:00
Brion Vibber
c36fecb794
Save a thumbnail image when uploading an image file into the file attachments system. Currently hardcoded to 100x75, needs aspect-sensitivity etc.
2010-11-08 17:20:04 -08:00
Brion Vibber
dc497ed090
Break out ImageFile->resizeTo() from ImageFile->resize(); allows resizing images to non-square sizes and to arbitrary destinations. Will be used for creating thumbnails as well as the originala use of cropping/sizing avatars.
2010-11-08 16:56:08 -08:00
