summaryrefslogtreecommitdiff
path: root/classes/User.php
AgeCommit message (Collapse)Author
2010-12-17Merge branch '0.9.x' into 1.0.xBrion Vibber
Conflicts: classes/Memcached_DataObject.php
2010-12-17Update sorting for User::repeatedByMe() -- currently unused. Likely not ↵Brion Vibber
ideally indexed yet.
2010-12-17Update sorting on api/statuses/retweets_of_me; was and remains poorly ↵Brion Vibber
indexed, but will use updated sorting method.
2010-12-15Merge branch '0.9.x' into 1.0.xBrion Vibber
2010-12-12Move getConnectedApps() from Profile to User, where it belongsZach Copley
2010-12-07Merge branch '0.9.x' into mergeBrion Vibber
Conflicts: README actions/hostmeta.php classes/File_redirection.php lib/common.php lib/designsettings.php lib/router.php lib/util.php lib/xmppmanager.php plugins/OStatus/OStatusPlugin.php
2010-12-06Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.xBrion Vibber
Conflicts: classes/User.php
2010-12-06Added User::singleUserNickname() as (temporary?) fallback for single-user ↵Brion Vibber
lookup as a workaround for site setup of 1user sites. We found that an external tool attempting to spin up StatusNet and then register the user would fail because StatusNet's router setup dies on being unable to find its single-user account, since the nickname is needed in setting up routing entries. This tweak will let it survive, using the configured setting as a fallback if it can't actually find the user account.
2010-12-02Fix for tickets #2917, #2262: user URL shortening options not being applied ↵Brion Vibber
in non-web channels common_shorten_links() can only access the web session's logged-in user, so never properly took user options into effect for posting via XMPP, API, mail, etc. Adds an optional $user parameter on common_shorten_links(), and a $user->shortenLinks() as a clearer interface for that. Tweaked some lower-level functions so $user gets passed down -- making the $notice_id param previously there for saving URLs at notice save time generalized a little. Note also ticket #2919: there's a lot of duplicate code calling the shortening, checking the length, and reporting near-identical error messages. These should be consolidated to aid in code and translation maintenance.
2010-11-29doc comments on User::allowed_nicknameBrion Vibber
2010-11-15some User -> Profile cleanup to help in adapting the profile page action to ↵Brion Vibber
show stuff for remote users. Subscriptions, groups, roles, etc are all on profiles now so go ahead and use em.
2010-10-28Merge branch '0.9.x' into 1.0.xBrion Vibber
2010-10-28fall back to siteowner on bad nickname (Bug#2861)Evan Prodromou
2010-10-25Merge branch '0.9.x' into 1.0.xBrion Vibber
Conflicts: actions/subscriptions.php lib/router.php lib/xmppmanager.php lib/xmppoutqueuehandler.php
2010-10-21* translator documentation added.Siebrand Mazeland
* moved some translator comments that were not directly above the line with the message to the correct location. * i18n for UI text. * superfluous whitespace removed.
2010-10-20Fix for ticket #2845: singleuser nickname configuration was being overridden ↵Brion Vibber
by site owner in router setup. I've consolidated the checks for which user to use for single-user mode into User::singleUser(), which now uses the configured nickname by preference, falling back to the site owner if it's unset. This is now called consistently from the places that needed to use the primary user's nickname in routing setup. Setting $config['singleuser']['nickname'] should now work again as expected.
2010-10-04Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.xBrion Vibber
Conflicts: actions/hostmeta.php actions/imsettings.php classes/User.php lib/adminpanelaction.php lib/channel.php lib/default.php lib/router.php lib/util.php
2010-09-29Move blowFavesCache() to ProfileZach Copley
2010-09-29Move hasFave() to ProfileZach Copley
2010-09-22save a URI with the userEvan Prodromou
2010-09-20Fix for #2227: 'view profile designs' and other default-on options are ↵Brion Vibber
initially mis-set to off due to caching at account creation
2010-09-20Ticket #2327: fixing block to remove the blocking user's subscription to the ↵Brion Vibber
blockee if present; also cleaning up inbox delivery to apply the block checks more consistently, instead of just to group posts.
2010-09-06common_cache_key() -> Cache::key()Evan Prodromou
2010-09-06common_memcache() => Cache::instance()Evan Prodromou
2010-08-03Merge branch '0.9.x' into 1.0.xEvan Prodromou
2010-07-29* mark a few message for translationSiebrand Mazeland
* add translator documentation
2010-07-19Make some messages gender neutral.Eric Helgeson
2010-05-05Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.xBrion Vibber
Conflicts: lib/xmppmanager.php (resolved: code has moved to XmppPlugin.php)
2010-05-05Implement since_id and max_id param handling for /api/favoritesZach Copley
2010-04-18Merge branch '0.9.x' into 1.0.xCraig Andrews
Conflicts: actions/confirmaddress.php actions/imsettings.php
2010-04-10Allow blocking someone who's not currently subscribed to you (prevents ↵Brion Vibber
seeing @-replies from them, or them subbing to you in future)
2010-04-02Merge branch '0.9.x' into 1.0.xBrion Vibber
Conflicts: actions/imsettings.php lib/jabber.php Made a quick attempt to merge the new JID validation into the XmppPlugin, have not had a chance to test that version live yet. Should also move over the test cases.
2010-03-31use Subscription::cancel() to cancel all subscriptions on blockEvan Prodromou
2010-03-29Merge branch '0.9.x' into 1.0.xBrion Vibber
2010-03-28continue deleting even if user profile record is missingEvan Prodromou
2010-03-22Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 1.0.xBrion Vibber
Conflicts: lib/channel.php scripts/imdaemon.php
2010-03-18Fix for xmpp/sms notification options appearing to be disabled on new ↵Brion Vibber
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-18Merge branch 'master' of git@gitorious.org:statusnet/mainline into testingBrion Vibber
2010-03-18Ensure that DB connection is active at start of User::updateKeys() and ↵Brion Vibber
Foreign_user::updateKeys(); calls to $this->_quote() require a live connection object and don't lazy-initialize themselves. May fix WSOD when changing incoming email address.
2010-03-18add exception on inconsistent db to User::getProfile()Evan Prodromou
2010-03-11Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.xSarven Capadisli
2010-03-11Drop timestamp cutoff parameter from User::getCurrentNotice() and ↵Brion Vibber
Profile::getCurrentNotice(). It's not currently used, and won't be efficient when we update the notice.profile_id_idx index to optimize for our id-based sorting when pulling user post lists for profile pages, feeds etc.
2010-03-08Merge branch '0.9.x' into 1.0.xCraig Andrews
Conflicts: classes/statusnet.ini db/statusnet.sql lib/jabber.php lib/xmppmanager.php
2010-03-04Merge commit 'origin/testing' into 0.9.xBrion Vibber
Conflicts: lib/action.php lib/adminpanelaction.php
2010-03-03Use poster's subscribed groups to disambiguate group linking when a remote ↵Brion Vibber
group and a local group exist with the same name. (If you're a member of two groups with the same name though, there's not a defined winner.)
2010-03-02Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.xBrion Vibber
2010-03-02Dropped deprecated timestamp-based 'since' parameter for all API methods. ↵Brion Vibber
When it sneaks in it can cause some very slow queries due to mismatches with the indexing. Twitter removed 'since' support some time ago, and we've already removed it from the public timeline, so it shouldn't be missed.
2010-02-26bail out if the requested nickname is illegalCraig Andrews
2010-02-24Merge branch '0.9.x' into 1.0.xCraig Andrews
Conflicts: EVENTS.txt db/statusnet.sql lib/queuemanager.php
2010-02-19Refactor subs_* functions for remote useEvan Prodromou
The subs_* functions in subs.php have made a lot of assumptions about users versus profiles. I've refactored the functions to be methods of the Subscription class instead, and to use Profile objects throughout. Some of the checks for blocks or existing subscriptions depended on users or profiles, so I've moved those methods around a bit. I've left stubs for the subs_* functions until we get time to replace them.