Commit Graph

10899 Commits

Author SHA1 Message Date
Brion Vibber
855f1f6623 Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x 2010-08-09 13:11:41 -07:00
Luke Fitzgerald
322e7c4e9f Small reordering of code (cosmetic) 2010-08-09 09:26:31 -07:00
Luke Fitzgerald
613ae551c6 Set lastPing on connect 2010-08-09 07:08:29 -07:00
Luke Fitzgerald
bc331a0155 Made private methods protected 2010-08-09 07:05:58 -07:00
Luke Fitzgerald
d321b6e76f Requeue waiting messages on start/connection loss 2010-08-09 07:03:54 -07:00
Siebrand Mazeland
09dee24cbe Add two i18n related FIXMEs. 2010-08-08 21:13:21 +02:00
Luke Fitzgerald
da61c8567c Small cosmetic changes 2010-08-07 17:29:13 -07:00
Luke Fitzgerald
7cd52847a5 Added pinging to keep connection open 2010-08-07 17:25:43 -07:00
Luke Fitzgerald
067633a608 Added more commenting 2010-08-07 16:32:17 -07:00
Luke Fitzgerald
a9d9e077ba Merged in Phergie changes 2010-08-07 16:31:30 -07:00
Luke Fitzgerald
4b12b8f396 Cosmetic comment change 2010-08-07 13:28:11 -07:00
Luke Fitzgerald
841da54301 Merge remote branch 'statusnet/1.0.x' into msn-plugin 2010-08-07 13:26:07 -07:00
Luke Fitzgerald
bee5084072 Merge remote branch 'statusnet/1.0.x' into irc-plugin 2010-08-07 13:25:56 -07:00
Luke Fitzgerald
e23ad0bdb3 Commands can now be whitelisted to allow response to the channel 2010-08-07 13:25:05 -07:00
Siebrand Mazeland
5549600505 Localisation updates from http://translatewiki.net 2010-08-07 18:33:40 +02:00
James Walker
c8a706081e strip whitespace from me:data and me:sig (per spec) 2010-08-07 09:48:21 -04:00
Eric Helgeson
edb62db613 Locale error message, clean up {}, Verified under 1.0.x && php 5.3 2010-08-06 23:07:34 -05:00
Eric Helgeson
fd2919be18 Fixed PHP 5.3 by & value
Cleaned up {}'s
2010-08-06 22:51:45 -05:00
Eric Helgeson
422a6ef518 Fixed PHP 5.3 by & value
Cleaned up {}'s
2010-08-06 22:48:00 -05:00
Brion Vibber
39277ebf78 And.... one more fix for queueing in SubMirror. 2010-08-06 12:04:34 -07:00
Brion Vibber
729912e36a Missing file from SubMirror. :P 2010-08-06 12:00:31 -07:00
Brion Vibber
79485340ab SubMirror: Drop mirror link from subscriptions list; has decoupled from subscriptions. 2010-08-06 11:55:56 -07:00
Brion Vibber
7e55fc0044 OStatus/FeedSub: tweaked PuSH feed garbage collection so other plugins can declare usage of a low-level feed or an OStatus profile besides profile subscriptions & group memberships.
SubMirror: redid add-mirror frontend to accept a feed URL, then pass that on to OStatus, instead of pulling from your subscriptions.
Profile: tweaked subscriberCount() so it doesn't subtract 1 for foreign profiles who aren't subscribed to themselves; instead excludes the self-subscription in the count query.
Memcached_DataObject: tweak to avoid extra error spew in the DB error raising

Work in progress: tweaking feedsub garbage collection so we can count other uses
2010-08-06 11:49:52 -07:00
Brion Vibber
ebd2fc2f7c Partial fix for ticket #2489 -- problems with SNI SSL virtual host certificate validation.
Two prongs here:
* We attempt to enable SNI on the SSL stream context with the appropriate hostname... This requires PHP 5.3.2 and OpenSSL that supports the TLS extensions. Unfortunately this doesn't seem to be working in my testing.
* If set $config['http']['curl'] = true, we'll use the CURL backend if available. In my testing on Ubuntu 10.04, this works. No guarantees on other systems.

I'm not enabling CURL mode by default just yet; want to make sure there's no other surprises.
2010-08-06 10:14:07 -07:00
Brion Vibber
300ed65d30 SubMirror plugin initial checkin: allows setting up automatic mirroring of posts from any of your subscriptions into your own stream, either via repeat or by copying the text.
The UI for setup and editing is a bit nasty for now. Can be reached via 'Mirroring' tab in account settings, or from a link at top of subscriptions list.

Currently relies on the OStatus plugin to handle actual setup, parsing, and importing of feeds; to support more general feed formatting we may need some further work there to accept weird feeds.
Also requires an actual live subscription, but this could be changed in future. (Ensuring that PSHB feed subscriptions remain live even if nobody's directly subscribed might be tricky.)

The repeat style is our preferred method since it retains full attribution, but right now we don't handle repeats very well across site boundaries; when pushed out to Twitter or to other StatusNet instances via OStatus, currently we end up losing some of the data and can end up with the 'RT @blah' version.

WARNING: There's no loop detection yet; it's most likely possible to set up a fun loop of profiles repeating each others' stuff forever and ever and ever and ever...
2010-08-05 18:06:36 -07:00
Luke Fitzgerald
a6e865c47a Use nick length instead 2010-08-05 11:12:36 -07:00
Brion Vibber
433c43c999 Merge branch 'testing' into 0.9.x 2010-08-05 11:02:53 -07:00
Brion Vibber
77a96e3d7c Merge branch 'master' into testing 2010-08-05 10:56:49 -07:00
Luke Fitzgerald
1f3dbe1198 Bot responds to channel commands via PM 2010-08-05 10:48:41 -07:00
Luke Fitzgerald
55ec8a7465 Always remove messages from waiting queue and requeue messages if one fails 2010-08-04 16:14:25 -07:00
Luke Fitzgerald
cb34d95197 Merge in Phergie changes 2010-08-04 16:02:24 -07:00
Zach Copley
fd530a892f Fix for source attribution on notices; it was displaying the code instead of the source name sometimes. 2010-08-04 12:31:31 -07:00
Luke Fitzgerald
65a741cce2 Messages with new lines split at plugin stage for reliability 2010-08-04 09:10:57 -07:00
Luke Fitzgerald
2250273942 Only attempt callback if non-null 2010-08-04 08:46:04 -07:00
Luke Fitzgerald
4cfe04a68f Remove old debugging code 2010-08-03 20:07:59 -07:00
Evan Prodromou
9f0715a993 Merge branch '0.9.x' into 1.0.x 2010-08-03 16:05:03 -07:00
Evan Prodromou
004e42e3e0 Merge remote branch 'gitorious/1.0.x' into 1.0.x 2010-08-03 16:04:54 -07:00
Evan Prodromou
b17fc0ca5b update tests to include 'mentioned' links 2010-08-03 16:04:19 -07:00
Evan Prodromou
e2c90576c0 re-add mentioned link lost in last merge 2010-08-03 16:01:50 -07:00
Evan Prodromou
2ba36fc242 Merge branch 'activityhooks' into 0.9.x
Conflicts:
	classes/Notice.php
2010-08-03 16:01:18 -07:00
Evan Prodromou
f9a4728fcc Merge branch 'testing' into 0.9.x 2010-08-03 15:57:05 -07:00
Evan Prodromou
cc71f1ae82 output Atom dates in UTC 2010-08-03 15:55:40 -07:00
Evan Prodromou
f83171824f correctly show <source> for atom feeds 2010-08-03 15:50:21 -07:00
Evan Prodromou
744233c6dc add actor info to tests 2010-08-03 15:49:49 -07:00
Evan Prodromou
8d19162122 more tests for activity generation 2010-08-03 15:26:19 -07:00
Evan Prodromou
6756a752c4 add some more tests for replies and group posts 2010-08-03 14:17:36 -07:00
Evan Prodromou
1a6148f0e4 initial unit tests for activity generation 2010-08-03 13:41:44 -07:00
Luke Fitzgerald
678911af24 Revert "Merged in Phergie changes"
This reverts commit a3df3b6367.
2010-08-03 11:45:55 -07:00
Luke Fitzgerald
c71319419b Cosmetic whitespace change 2010-08-03 10:02:47 -07:00
Luke Fitzgerald
a3df3b6367 Merged in Phergie changes 2010-08-03 09:42:02 -07:00