Brion Vibber
5a96b9e805
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
2010-06-07 10:34:00 -07:00
Evan Prodromou
6d39a75137
use DB_DataObject_Cast objects in a couple of different places in the code
2010-06-04 15:29:38 -04:00
Evan Prodromou
cbdeb6fb8f
Merge branch 'master' of gitorious.org:statusnet/mainline
2010-06-04 13:26:25 -04:00
Evan Prodromou
f1ea678aae
memcache_dataobject supports some DB_DataObject_Cast objects as values
2010-06-04 12:52:05 -04:00
Brion Vibber
8b9436e8ae
Option to divert PuSH items directly to the target site's queue when local
2010-06-03 18:06:55 -07:00
Brion Vibber
5f4c6ec626
Skip enqueueing to outgoing bridges on incoming remote messages. Twitter, Facebook, RSSCloud, and OStatus checks were enqueued on these when they'd never do anything but churn the queue servers.
...
Notice::isLocal() can replace a number of manual checks for $notice->is_local being LOCAL_PUBLIC or LOCAL_NONPUBLIC.
2010-06-03 16:58:45 -07:00
Zach Copley
1a44d4272f
Add repeated attr to Atom notices_info element
2010-06-03 22:24:55 +00:00
Brion Vibber
17ab15a3d0
Fix memory leak in Inbox::addToInbox() (usage of raw DB_DataObject::staticGet, which leaks memory into a process-global cache).
...
On my test setup, this fixes inbox delivery to 10,000 local recipients from background queuedaemon running with a 32mb memory limit, completes the job within a minute from start.
2010-06-01 13:53:44 -07:00
Zach Copley
80d1e86a7c
Add repeat info to statusnet:notice_info Atom element
2010-05-26 00:39:44 +00:00
Brion Vibber
e68d2c9015
Merge branch 'master' of gitorious.org:statusnet/mainline
2010-05-25 13:11:36 -07:00
Brion Vibber
95159112b2
Hotpatch for infinite redirection-following loop seen processing URLs to http://clojure.org/ -- if we end up with an unstable redirect target (final item in a redirect chain ends up redirecting us somewhere else when we visit it again), just save the last version we saw instead of trying to start over.
...
Pretty much everything in File and File_redirection initial processing needs to be rewritten to be non-awful; this code is very hard to follow and very easy to make huge bugs. A fair amount of the complication is probably obsoleted by the redirection following being built into HTTPClient now.
2010-05-25 13:09:21 -07:00
Brion Vibber
f7add6f25f
Handle funky notice deletion cases more gracefully: if we already have a deleted_notice entry, don't freak out when we try to save it again on the second try.
2010-05-24 07:47:15 -07:00
Zach Copley
114df39822
Need to always emit statusnet:notice_info so it's available in profile feeds
2010-05-18 15:17:05 -07:00
Zach Copley
5ea019c41a
Remove errant double HTML entity encoding in API source attribution
2010-05-18 15:16:23 -07:00
Zach Copley
68634f0496
Add source link attr to statusnet:notice_info element in Atom output for notices
2010-05-18 15:15:41 -07:00
Zach Copley
c78f67aa73
Refactor and centralize notice source link calculation
2010-05-18 15:15:27 -07:00
Zach Copley
d9fddff539
Add xmlns:statusnet and statusnet:notice_info element to Atom entries for notices
2010-05-18 15:15:14 -07:00
Zach Copley
b50f300566
Implement since_id and max_id param handling for /api/favorites
2010-05-05 14:46:36 -07:00
Brion Vibber
dd7b95c2cf
Merge branch 'master' into testing
2010-04-23 14:26:57 -07:00
Brion Vibber
7bdea95ccb
Fix to make blowing of replies stream cache more consistent when receiving replies. (Was being done at mail notify time instead of at save time for local replies; now moved to reply save time internally so it can't get forgotten)
2010-04-23 06:55:46 -07:00
Brion Vibber
61098faf5d
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
2010-04-20 13:52:18 +02:00
Brion Vibber
c48caa85e1
Fix email notifications for @-replies that come via OStatus.
...
* Moved notification sending from Notice::saveReplies to distrib queue handler, so it'll pull from the reply set we've saved regardless of how we got it.
* Set up gettext infrastructure for command-line scripts; gets localization mail notifications etc working from background queues.
* Adjusted locale switching: common_switch_locale() works at runtime for bg scripts, forces a message catalog update
2010-04-20 13:49:29 +02:00
Brion Vibber
3da50c19df
Merge branch 'master' into testing
2010-04-14 11:15:21 +02:00
Brion Vibber
a21a172639
Fix for "#foo !foo" in same notice failing during save, causing failout before distribution. Move saveGroups after saveTags when saving notices; groups may save additional tags, so need to be moved after so the check for duplicates actually works.
2010-04-14 11:11:02 +02:00
Brion Vibber
d445b977fc
move comment to correct place
2010-04-14 11:09:54 +02:00
Brion Vibber
edd883d3b0
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
2010-04-10 17:54:37 -07:00
Brion Vibber
71c828de89
Allow blocking someone who's not currently subscribed to you (prevents seeing @-replies from them, or them subbing to you in future)
2010-04-10 17:52:40 -07:00
Brion Vibber
6fb60fb57f
Fix for conversation check in @-reply notification email; i18n cleanup on mail messages: fixed some bad gettext usage, added trans doc comments.
2010-04-09 12:02:11 -07:00
Evan Prodromou
ce40425533
Merge branch 'master' of gitorious.org:statusnet/mainline
2010-04-09 14:06:24 -04:00
Brion Vibber
9cb0dab270
Run block checks on remote OStatus replies
2010-04-09 10:48:18 -07:00
Brion Vibber
80bd77ced3
Run block checks on remote OStatus replies
2010-04-09 10:46:18 -07:00
Evan Prodromou
08745e4eac
Merge branch 'master' into testing
2010-04-07 10:45:44 -04:00
Evan Prodromou
82326a3b69
show PEAR_Error message, not the object
2010-04-07 10:43:14 -04:00
Brion Vibber
ec24f283dd
Don't save duplicate messages into a user's packed inbox. We've already got the packed box loaded at insert time, so we can simply unpack it and check before doing the update query.
...
Should help with dupes that come in when inbox distrib jobs die and get restarted, etc.
Conflicts:
classes/Inbox.php
Looks like this was implemented on master recently and not copied up to testing. Merging to my version on testing as I've added some doc comments and extracted a couple functions for future ease of use.
2010-04-02 15:45:03 -07:00
Brion Vibber
61394aa8ac
Don't save duplicate messages into a user's packed inbox. We've already got the packed box loaded at insert time, so we can simply unpack it and check before doing the update query.
...
Should help with dupes that come in when inbox distrib jobs die and get restarted, etc.
2010-04-02 15:43:30 -07:00
Brion Vibber
f1c01f9ead
Temporary hack until notice_profile_id_idx is updated
...
to (profile_id, id) instead of (profile_id, created, id).
It's been falling back to PRIMARY instead, which is really
very inefficient for a profile that hasn't posted in a few
months. Even though forcing the index will cause a filesort,
it's usually going to be better. Even for large profiles it
seems much faster than the badly-indexed query.
2010-04-01 10:17:17 -07:00
Brion Vibber
9f2cfd20f8
Temporary hack until notice_profile_id_idx is updated
...
to (profile_id, id) instead of (profile_id, created, id).
It's been falling back to PRIMARY instead, which is really
very inefficient for a profile that hasn't posted in a few
months. Even though forcing the index will cause a filesort,
it's usually going to be better. Even for large profiles it
seems much faster than the badly-indexed query.
2010-04-01 10:15:40 -07:00
Evan Prodromou
9efe5393ff
Revert "Revert "don't insert the same notice twice into an inbox""
...
This reverts commit a09b27ff41
.
2010-04-01 12:57:52 -04:00
Evan Prodromou
a09b27ff41
Revert "don't insert the same notice twice into an inbox"
...
This reverts commit 650074c648
.
2010-04-01 12:52:26 -04:00
Evan Prodromou
650074c648
don't insert the same notice twice into an inbox
2010-03-31 15:54:35 -04:00
Brion Vibber
3ed88938b9
Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing
2010-03-31 12:47:42 -07:00
Evan Prodromou
d3f995846b
use Subscription::cancel() to cancel all subscriptions on block
2010-03-31 15:20:16 -04:00
Evan Prodromou
c1c7feedbd
do complete unsubscribe process when deleting a user
2010-03-31 15:02:19 -04:00
Brion Vibber
873b832827
Merge branch 'master' into testing
...
Conflicts:
plugins/Blacklist/BlacklistPlugin.php
2010-03-29 15:14:25 -07:00
Brion Vibber
d44e5ac935
Add $config['db']['annotate_queries'] option to include caller ID comments into queries. Comment can then be seen in process list, slow query logs on the server, aiding in tracking down unexpected slow queries.
...
SELECT /* queuedaemon.php Ostatus_profile->processPost */ * FROM notice WHERE ( notice.uri = 'http://stormcloud.local/mublog2/notice/479 ' )
INSERT /* POST Notice::saveNew */ INTO notice (profile_id , content ....
2010-03-29 13:14:11 -07:00
Evan Prodromou
65766a0ebe
continue deleting even if user profile record is missing
2010-03-28 11:58:16 -04:00
Brion Vibber
13d59e0c76
fixup_deletions.php script to look for notices posted by now-deleted profiles and remove them.
2010-03-23 17:24:01 -07:00
Brion Vibber
7277b59734
Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing
2010-03-23 12:13:32 -07:00
Brion Vibber
44caa3a93f
Consistently send Profiles into Fave::addNew()
2010-03-23 11:08:30 -07:00
Brion Vibber
80b16c8499
Don't add PHPSESSID parameter onto notice and conversation URIs if we save a notice during a session override.
...
This was being triggered by welcomebot messages created at account creation time, then propagated through replies.
2010-03-23 09:56:05 -07:00