Merge remote-tracking branch 'remotes/shish/master' into speed
This commit is contained in:
green-ponies (jgen)
commit
d1495050ab
6 changed files with 371 additions and 12 deletions
23
contrib/twitter_soc/main.php
Normal file
23
contrib/twitter_soc/main.php
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
<?php
|
||||
/*
|
||||
* Name: Tweet!
|
||||
* Author: Shish <webmaster@shishnet.org>
|
||||
* License: GPLv2
|
||||
* Description: Show a twitter feed with the Sea of Clouds script
|
||||
*/
|
||||
|
||||
class TwitterSoc extends SimpleExtension {
|
||||
public function onPostListBuilding($event) {
|
||||
global $config, $page;
|
||||
if(strlen($config->get_string("twitter_soc_username")) > 0) {
|
||||
$this->theme->display_feed($page, $config->get_string("twitter_soc_username"));
|
||||
}
|
||||
}
|
||||
|
||||
public function onSetupBuilding($event) {
|
||||
$sb = new SetupBlock("Tweet!");
|
||||
$sb->add_text_option("twitter_soc_username", "Username ");
|
||||
$event->panel->add_block($sb);
|
||||
}
|
||||
}
|
||||
?>
|
||||
238
contrib/twitter_soc/script.js
Normal file
238
contrib/twitter_soc/script.js
Normal file
|
|
@ -0,0 +1,238 @@
|
|||
// jquery.tweet.js - See http://tweet.seaofclouds.com/ or https://github.com/seaofclouds/tweet for more info
|
||||
// Copyright (c) 2008-2011 Todd Matthews & Steve Purcell
|
||||
(function($) {
|
||||
$.fn.tweet = function(o){
|
||||
var s = $.extend({
|
||||
username: null, // [string or array] required unless using the 'query' option; one or more twitter screen names (use 'list' option for multiple names, where possible)
|
||||
list: null, // [string] optional name of list belonging to username
|
||||
favorites: false, // [boolean] display the user's favorites instead of his tweets
|
||||
query: null, // [string] optional search query (see also: http://search.twitter.com/operators)
|
||||
avatar_size: null, // [integer] height and width of avatar if displayed (48px max)
|
||||
count: 3, // [integer] how many tweets to display?
|
||||
fetch: null, // [integer] how many tweets to fetch via the API (set this higher than 'count' if using the 'filter' option)
|
||||
page: 1, // [integer] which page of results to fetch (if count != fetch, you'll get unexpected results)
|
||||
retweets: true, // [boolean] whether to fetch (official) retweets (not supported in all display modes)
|
||||
intro_text: null, // [string] do you want text BEFORE your your tweets?
|
||||
outro_text: null, // [string] do you want text AFTER your tweets?
|
||||
join_text: null, // [string] optional text in between date and tweet, try setting to "auto"
|
||||
auto_join_text_default: "i said,", // [string] auto text for non verb: "i said" bullocks
|
||||
auto_join_text_ed: "i", // [string] auto text for past tense: "i" surfed
|
||||
auto_join_text_ing: "i am", // [string] auto tense for present tense: "i was" surfing
|
||||
auto_join_text_reply: "i replied to", // [string] auto tense for replies: "i replied to" @someone "with"
|
||||
auto_join_text_url: "i was looking at", // [string] auto tense for urls: "i was looking at" http:...
|
||||
loading_text: null, // [string] optional loading text, displayed while tweets load
|
||||
refresh_interval: null , // [integer] optional number of seconds after which to reload tweets
|
||||
twitter_url: "twitter.com", // [string] custom twitter url, if any (apigee, etc.)
|
||||
twitter_api_url: "api.twitter.com", // [string] custom twitter api url, if any (apigee, etc.)
|
||||
twitter_search_url: "search.twitter.com", // [string] custom twitter search url, if any (apigee, etc.)
|
||||
template: "{avatar}{time}{join}{text}", // [string or function] template used to construct each tweet <li> - see code for available vars
|
||||
comparator: function(tweet1, tweet2) { // [function] comparator used to sort tweets (see Array.sort)
|
||||
return tweet2["tweet_time"] - tweet1["tweet_time"];
|
||||
},
|
||||
filter: function(tweet) { // [function] whether or not to include a particular tweet (be sure to also set 'fetch')
|
||||
return true;
|
||||
}
|
||||
}, o);
|
||||
|
||||
// See http://daringfireball.net/2010/07/improved_regex_for_matching_urls
|
||||
var url_regexp = /\b((?:[a-z][\w-]+:(?:\/{1,3}|[a-z0-9%])|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}\/)(?:[^\s()<>]+|\(([^\s()<>]+|(\([^\s()<>]+\)))*\))+(?:\(([^\s()<>]+|(\([^\s()<>]+\)))*\)|[^\s`!()\[\]{};:'".,<>?«»“”‘’]))/gi;
|
||||
|
||||
// Expand values inside simple string templates with {placeholders}
|
||||
function t(template, info) {
|
||||
if (typeof template === "string") {
|
||||
var result = template;
|
||||
for(var key in info) {
|
||||
var val = info[key];
|
||||
result = result.replace(new RegExp('{'+key+'}','g'), val === null ? '' : val);
|
||||
}
|
||||
return result;
|
||||
} else return template(info);
|
||||
}
|
||||
// Export the t function for use when passing a function as the 'template' option
|
||||
$.extend({tweet: {t: t}});
|
||||
|
||||
function replacer (regex, replacement) {
|
||||
return function() {
|
||||
var returning = [];
|
||||
this.each(function() {
|
||||
returning.push(this.replace(regex, replacement));
|
||||
});
|
||||
return $(returning);
|
||||
};
|
||||
}
|
||||
|
||||
function escapeHTML(s) {
|
||||
return s.replace(/</g,"<").replace(/>/g,"^>");
|
||||
}
|
||||
|
||||
$.fn.extend({
|
||||
linkUser: replacer(/(^|[\W])@(\w+)/gi, "$1@<a href=\"http://"+s.twitter_url+"/$2\">$2</a>"),
|
||||
// Support various latin1 (\u00**) and arabic (\u06**) alphanumeric chars
|
||||
linkHash: replacer(/(?:^| )[\#]+([\w\u00c0-\u00d6\u00d8-\u00f6\u00f8-\u00ff\u0600-\u06ff]+)/gi,
|
||||
' <a href="http://'+s.twitter_search_url+'/search?q=&tag=$1&lang=all'+((s.username && s.username.length == 1 && !s.list) ? '&from='+s.username.join("%2BOR%2B") : '')+'">#$1</a>'),
|
||||
capAwesome: replacer(/\b(awesome)\b/gi, '<span class="awesome">$1</span>'),
|
||||
capEpic: replacer(/\b(epic)\b/gi, '<span class="epic">$1</span>'),
|
||||
makeHeart: replacer(/(<)+[3]/gi, "<tt class='heart'>♥</tt>")
|
||||
});
|
||||
|
||||
function linkURLs(text, entities) {
|
||||
return text.replace(url_regexp, function(match) {
|
||||
var url = (/^[a-z]+:/i).test(match) ? match : "http://"+match;
|
||||
var text = match;
|
||||
for(var i = 0; i < entities.length; ++i) {
|
||||
var entity = entities[i];
|
||||
if (entity.url == url && entity.expanded_url) {
|
||||
url = entity.expanded_url;
|
||||
text = entity.display_url;
|
||||
break;
|
||||
}
|
||||
}
|
||||
return "<a href=\""+escapeHTML(url)+"\">"+escapeHTML(text)+"</a>";
|
||||
});
|
||||
}
|
||||
|
||||
function parse_date(date_str) {
|
||||
// The non-search twitter APIs return inconsistently-formatted dates, which Date.parse
|
||||
// cannot handle in IE. We therefore perform the following transformation:
|
||||
// "Wed Apr 29 08:53:31 +0000 2009" => "Wed, Apr 29 2009 08:53:31 +0000"
|
||||
return Date.parse(date_str.replace(/^([a-z]{3})( [a-z]{3} \d\d?)(.*)( \d{4})$/i, '$1,$2$4$3'));
|
||||
}
|
||||
|
||||
function relative_time(date) {
|
||||
var relative_to = (arguments.length > 1) ? arguments[1] : new Date();
|
||||
var delta = parseInt((relative_to.getTime() - date) / 1000, 10);
|
||||
var r = '';
|
||||
if (delta < 1) {
|
||||
r = 'just now';
|
||||
} else if (delta < 60) {
|
||||
r = delta + ' seconds ago';
|
||||
} else if(delta < 120) {
|
||||
r = 'a minute ago';
|
||||
} else if(delta < (45*60)) {
|
||||
r = (parseInt(delta / 60, 10)).toString() + ' minutes ago';
|
||||
} else if(delta < (2*60*60)) {
|
||||
r = 'an hour ago';
|
||||
} else if(delta < (24*60*60)) {
|
||||
r = '' + (parseInt(delta / 3600, 10)).toString() + ' hours ago';
|
||||
} else if(delta < (48*60*60)) {
|
||||
r = 'a day ago';
|
||||
} else {
|
||||
r = (parseInt(delta / 86400, 10)).toString() + ' days ago';
|
||||
}
|
||||
return 'about ' + r;
|
||||
}
|
||||
|
||||
function build_auto_join_text(text) {
|
||||
if (text.match(/^(@([A-Za-z0-9-_]+)) .*/i)) {
|
||||
return s.auto_join_text_reply;
|
||||
} else if (text.match(url_regexp)) {
|
||||
return s.auto_join_text_url;
|
||||
} else if (text.match(/^((\w+ed)|just) .*/im)) {
|
||||
return s.auto_join_text_ed;
|
||||
} else if (text.match(/^(\w*ing) .*/i)) {
|
||||
return s.auto_join_text_ing;
|
||||
} else {
|
||||
return s.auto_join_text_default;
|
||||
}
|
||||
}
|
||||
|
||||
function build_api_url() {
|
||||
var proto = ('https:' == document.location.protocol ? 'https:' : 'http:');
|
||||
var count = (s.fetch === null) ? s.count : s.fetch;
|
||||
var common_params = '&include_entities=1&callback=?';
|
||||
if (s.list) {
|
||||
return proto+"//"+s.twitter_api_url+"/1/"+s.username[0]+"/lists/"+s.list+"/statuses.json?page="+s.page+"&per_page="+count+common_params;
|
||||
} else if (s.favorites) {
|
||||
return proto+"//"+s.twitter_api_url+"/favorites/"+s.username[0]+".json?page="+s.page+"&count="+count+common_params;
|
||||
} else if (s.query === null && s.username.length == 1) {
|
||||
return proto+'//'+s.twitter_api_url+'/1/statuses/user_timeline.json?screen_name='+s.username[0]+'&count='+count+(s.retweets ? '&include_rts=1' : '')+'&page='+s.page+common_params;
|
||||
} else {
|
||||
var query = (s.query || 'from:'+s.username.join(' OR from:'));
|
||||
return proto+'//'+s.twitter_search_url+'/search.json?&q='+encodeURIComponent(query)+'&rpp='+count+'&page='+s.page+common_params;
|
||||
}
|
||||
}
|
||||
|
||||
function extract_avatar_url(item, secure) {
|
||||
if (secure) {
|
||||
return ('user' in item) ?
|
||||
item.user.profile_image_url_https :
|
||||
extract_avatar_url(item, false).
|
||||
replace(/^http:\/\/[a-z0-9]{1,3}\.twimg\.com\//, "https://s3.amazonaws.com/twitter_production/");
|
||||
} else {
|
||||
return item.profile_image_url || item.user.profile_image_url;
|
||||
}
|
||||
}
|
||||
|
||||
// Convert twitter API objects into data available for
|
||||
// constructing each tweet <li> using a template
|
||||
function extract_template_data(item){
|
||||
var o = {};
|
||||
o.item = item;
|
||||
o.source = item.source;
|
||||
o.screen_name = item.from_user || item.user.screen_name;
|
||||
o.avatar_size = s.avatar_size;
|
||||
o.avatar_url = extract_avatar_url(item, (document.location.protocol === 'https:'));
|
||||
o.retweet = typeof(item.retweeted_status) != 'undefined';
|
||||
o.tweet_time = parse_date(item.created_at);
|
||||
o.join_text = s.join_text == "auto" ? build_auto_join_text(item.text) : s.join_text;
|
||||
o.tweet_id = item.id_str;
|
||||
o.twitter_base = "http://"+s.twitter_url+"/";
|
||||
o.user_url = o.twitter_base+o.screen_name;
|
||||
o.tweet_url = o.user_url+"/status/"+o.tweet_id;
|
||||
o.reply_url = o.twitter_base+"intent/tweet?in_reply_to="+o.tweet_id;
|
||||
o.retweet_url = o.twitter_base+"intent/retweet?tweet_id="+o.tweet_id;
|
||||
o.favorite_url = o.twitter_base+"intent/favorite?tweet_id="+o.tweet_id;
|
||||
o.retweeted_screen_name = o.retweet && item.retweeted_status.user.screen_name;
|
||||
o.tweet_relative_time = relative_time(o.tweet_time);
|
||||
o.entities = item.entities ? (item.entities.urls || []).concat(item.entities.media || []) : [];
|
||||
o.tweet_raw_text = o.retweet ? ('RT @'+o.retweeted_screen_name+' '+item.retweeted_status.text) : item.text; // avoid '...' in long retweets
|
||||
o.tweet_text = $([linkURLs(o.tweet_raw_text, o.entities)]).linkUser().linkHash()[0];
|
||||
o.tweet_text_fancy = $([o.tweet_text]).makeHeart().capAwesome().capEpic()[0];
|
||||
|
||||
// Default spans, and pre-formatted blocks for common layouts
|
||||
o.user = t('<a class="tweet_user" href="{user_url}">{screen_name}</a>', o);
|
||||
o.join = s.join_text ? t(' <span class="tweet_join">{join_text}</span> ', o) : ' ';
|
||||
o.avatar = o.avatar_size ?
|
||||
t('<a class="tweet_avatar" href="{user_url}"><img src="{avatar_url}" height="{avatar_size}" width="{avatar_size}" alt="{screen_name}\'s avatar" title="{screen_name}\'s avatar" border="0"/></a>', o) : '';
|
||||
o.time = t('<span class="tweet_time"><a href="{tweet_url}" title="view tweet on twitter">{tweet_relative_time}</a></span>', o);
|
||||
o.text = t('<span class="tweet_text">{tweet_text_fancy}</span>', o);
|
||||
o.reply_action = t('<a class="tweet_action tweet_reply" href="{reply_url}">reply</a>', o);
|
||||
o.retweet_action = t('<a class="tweet_action tweet_retweet" href="{retweet_url}">retweet</a>', o);
|
||||
o.favorite_action = t('<a class="tweet_action tweet_favorite" href="{favorite_url}">favorite</a>', o);
|
||||
return o;
|
||||
}
|
||||
|
||||
return this.each(function(i, widget){
|
||||
var list = $('<ul class="tweet_list">');
|
||||
var intro = '<p class="tweet_intro">'+s.intro_text+'</p>';
|
||||
var outro = '<p class="tweet_outro">'+s.outro_text+'</p>';
|
||||
var loading = $('<p class="loading">'+s.loading_text+'</p>');
|
||||
|
||||
if(s.username && typeof(s.username) == "string"){
|
||||
s.username = [s.username];
|
||||
}
|
||||
|
||||
$(widget).bind("tweet:load", function(){
|
||||
if (s.loading_text) $(widget).empty().append(loading);
|
||||
$.getJSON(build_api_url(), function(data){
|
||||
$(widget).empty().append(list);
|
||||
if (s.intro_text) list.before(intro);
|
||||
list.empty();
|
||||
|
||||
var tweets = $.map(data.results || data, extract_template_data);
|
||||
tweets = $.grep(tweets, s.filter).sort(s.comparator).slice(0, s.count);
|
||||
list.append($.map(tweets, function(o) { return "<li>" + t(s.template, o) + "</li>"; }).join('')).
|
||||
children('li:first').addClass('tweet_first').end().
|
||||
children('li:odd').addClass('tweet_even').end().
|
||||
children('li:even').addClass('tweet_odd');
|
||||
|
||||
if (s.outro_text) list.after(outro);
|
||||
$(widget).trigger("loaded").trigger((tweets.length === 0 ? "empty" : "full"));
|
||||
if (s.refresh_interval) {
|
||||
window.setTimeout(function() { $(widget).trigger("tweet:load"); }, 1000 * s.refresh_interval);
|
||||
}
|
||||
});
|
||||
}).trigger("tweet:load");
|
||||
});
|
||||
};
|
||||
})(jQuery);
|
||||
44
contrib/twitter_soc/style.css
Normal file
44
contrib/twitter_soc/style.css
Normal file
|
|
@ -0,0 +1,44 @@
|
|||
.tweet,
|
||||
.query {
|
||||
font: 120% Georgia, serif;
|
||||
color: #085258;
|
||||
}
|
||||
|
||||
.tweet_list {
|
||||
-webkit-border-radius: 0.5em;
|
||||
-moz-border-radius: 0.5em;
|
||||
border-radius: 0.5em;
|
||||
list-style: none;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
overflow-y: hidden;
|
||||
/*background-color: #8ADEE2;*/
|
||||
}
|
||||
|
||||
.tweet_list .awesome,
|
||||
.tweet_list .epic {
|
||||
text-transform: uppercase;
|
||||
}
|
||||
|
||||
.tweet_list li {
|
||||
overflow-y: auto;
|
||||
overflow-x: hidden;
|
||||
padding: 0.5em;
|
||||
list-style-type: none;
|
||||
}
|
||||
|
||||
.tweet_list li a {
|
||||
color: #0C717A;
|
||||
}
|
||||
|
||||
.tweet_list .tweet_even {
|
||||
/*background-color: #91E5E7;*/
|
||||
}
|
||||
|
||||
.tweet_list .tweet_avatar {
|
||||
padding-right: .5em; float: left;
|
||||
}
|
||||
|
||||
.tweet_list .tweet_avatar img {
|
||||
vertical-align: middle;
|
||||
}
|
||||
29
contrib/twitter_soc/test.php
Normal file
29
contrib/twitter_soc/test.php
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
<?php
|
||||
class TwitterSocTest extends SCoreWebTestCase {
|
||||
function testFeed() {
|
||||
$this->log_in_as_admin();
|
||||
|
||||
$this->get_page("setup");
|
||||
$this->set_field("_config_twitter_soc_username", "shish2k");
|
||||
$this->click("Save Settings");
|
||||
|
||||
/*
|
||||
$this->get_page("post/list");
|
||||
$this->assert_text("Note");
|
||||
$this->assert_text("kittens");
|
||||
*/
|
||||
|
||||
$this->get_page("setup");
|
||||
$this->set_field("_config_twitter_soc_username", "");
|
||||
$this->click("Save Settings");
|
||||
|
||||
/*
|
||||
$this->get_page("post/list");
|
||||
$this->assert_no_text("Note");
|
||||
$this->assert_no_text("kittens");
|
||||
*/
|
||||
|
||||
$this->log_out();
|
||||
}
|
||||
}
|
||||
?>
|
||||
25
contrib/twitter_soc/theme.php
Normal file
25
contrib/twitter_soc/theme.php
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
<?php
|
||||
|
||||
class TwitterSocTheme extends Themelet {
|
||||
/*
|
||||
* Show $text on the $page
|
||||
*/
|
||||
public function display_feed(Page $page, $username) {
|
||||
$page->add_block(new Block("Tweets", '
|
||||
<div class="tweet_soc"></div>
|
||||
<p><a href="http://twitter.com/'.url_escape($username).'">Follow us on Twitter</a>
|
||||
<script type="text/javascript">
|
||||
$(function() {
|
||||
$(".tweet_soc").tweet({
|
||||
username: "'.html_escape($username).'",
|
||||
join_text: "auto",
|
||||
template: "{text} -- {time}",
|
||||
count: 6,
|
||||
loading_text: "loading tweets..."
|
||||
});
|
||||
});
|
||||
</script>
|
||||
', "left", 25));
|
||||
}
|
||||
}
|
||||
?>
|
||||
24
index.php
24
index.php
|
|
@ -57,18 +57,18 @@ if(empty($database_dsn) && !file_exists("config.php")) {
|
|||
require_once "config.php";
|
||||
|
||||
// set up and purify the environment
|
||||
define("DEBUG", false);
|
||||
define("COVERAGE", false);
|
||||
define("CONTEXT", false);
|
||||
define("CACHE_MEMCACHE", false);
|
||||
define("CACHE_DIR", false);
|
||||
define("CACHE_HTTP", false);
|
||||
define("VERSION", 'trunk');
|
||||
define("SCORE_VERSION", 's2hack/'.VERSION);
|
||||
define("COOKIE_PREFIX", 'shm');
|
||||
define("SPEED_HAX", false);
|
||||
define("FORCE_NICE_URLS", false);
|
||||
define("WH_SPLITS", 1);
|
||||
if(!defined("DEBUG")) define("DEBUG", false);
|
||||
if(!defined("COVERAGE")) define("COVERAGE", false);
|
||||
if(!defined("CONTEXT")) define("CONTEXT", false);
|
||||
if(!defined("CACHE_MEMCACHE")) define("CACHE_MEMCACHE", false);
|
||||
if(!defined("CACHE_DIR")) define("CACHE_DIR", false);
|
||||
if(!defined("CACHE_HTTP")) define("CACHE_HTTP", false);
|
||||
if(!defined("VERSION")) define("VERSION", 'trunk');
|
||||
if(!defined("SCORE_VERSION")) define("SCORE_VERSION", 's2hack/'.VERSION);
|
||||
if(!defined("COOKIE_PREFIX")) define("COOKIE_PREFIX", 'shm');
|
||||
if(!defined("SPEED_HAX")) define("SPEED_HAX", false);
|
||||
if(!defined("FORCE_NICE_URLS")) define("FORCE_NICE_URLS", false);
|
||||
if(!defined("WH_SPLITS")) define("WH_SPLITS", 1);
|
||||
|
||||
require_once "core/util.inc.php";
|
||||
require_once "lib/context.php";
|
||||
|
|
|
|||
Reference in a new issue