Commit Graph

421 Commits

Author SHA1 Message Date
James Walker
7065450f03 normalizing tags for status_network 2010-07-20 17:34:58 -07:00
Brion Vibber
83c2e0b379 Merge branch 'master' into 0.9.x 2010-06-28 15:13:39 -04:00
Zach Copley
d87b3f3d2e Add notice source for StatusNet Desktop 2010-06-28 12:02:08 -07:00
Brion Vibber
004200f958 Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x 2010-06-11 12:09:55 -07:00
Brion Vibber
7f3b3620af Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x 2010-06-11 12:05:53 -07:00
Brion Vibber
b1a68e15b7 Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
Conflicts:
	lib/default.php
	lib/util.php
	plugins/UrlShortener/UrlShortenerPlugin.php (has been removed?)
2010-06-10 15:37:06 -07:00
Brion Vibber
d88b208edc Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
Conflicts:
	plugins/OpenID/openid.php
2010-06-07 10:19:40 -07:00
Zach Copley
02c68ff523 Add gNewBook to notice sources 2010-06-04 13:16:47 -07:00
Zach Copley
83b976f7ea Added DarterosStatus to notice sources 2010-05-31 15:48:24 -07:00
Brenda Wallace
cc25ec1755 added the inbox table to postgres upgrade script 2010-05-27 15:07:13 +12:00
Brenda Wallace
af4fd32742 added the inbox table to postgres upgrade script 2010-05-27 03:06:42 +00:00
Brenda Wallace
11398190f0 added user_location_prefs to upgrade script 2010-05-27 15:02:01 +12:00
Brenda Wallace
eed0facc87 added user_location_prefs to upgrade script 2010-05-27 03:00:58 +00:00
Brenda Wallace
f429c1aaa0 the sent column wasn't being populated, needed default 2010-05-25 16:25:35 +12:00
Brenda Wallace
bfef918482 queue_item in _pg now matches mysql 2010-05-22 20:52:53 +12:00
Brenda Wallace
249c820559 migration of data in queue_item to new table 2010-05-22 20:50:30 +12:00
Brenda Wallace
f4d0f721c8 fixed up comment syntax 2010-05-22 20:09:51 +12:00
Brenda Wallace
d7d49942f7 Merge commit 'mainline/0.9.x' into 0.9.x 2010-05-22 20:06:18 +12:00
Brenda Wallace
fa4a2d3485 added verifier and verified_callback to postgres schema and update script 2010-05-22 20:04:46 +12:00
Zach Copley
cef2ded9e7 Add TweetDeck to notice sources 2010-05-21 10:31:00 -07:00
Zach Copley
afd81a540a Add TweetDeck to notice sources 2010-05-21 10:30:32 -07:00
Zach Copley
bbfd6eff0c Add TweetDeck to notice sources 2010-05-21 10:29:43 -07:00
Brenda Wallace
8395925247 added comsumer_secret to consumer table on postgres 2010-05-21 21:09:40 +12:00
Brenda Wallace
069a38e624 add comsumer_secret column to consumer 2010-05-21 21:04:57 +12:00
Brion Vibber
c4203be9a4 Merge branch '0.9.x' into 1.0.x 2010-05-19 12:52:23 -07:00
Patrick Georgi
a968cc6999 updated database for postgres 2010-05-17 13:47:27 +12:00
Zach Copley
f803c1fbfe Add Emacs Identica-mode to notice sources 2010-05-04 12:43:30 -07:00
Zach Copley
68eaa2e12a Add Emacs Identica-mode to notice sources 2010-05-04 12:43:04 -07:00
Zach Copley
9d2c3d45bc Add Emacs Identica-mode to notice sources 2010-05-04 12:31:55 -07:00
Evan Prodromou
14adb7cc41 Give users more control over URL shortening
Users and administrators can set how long an URL can be before it's
shortened, and how long a notice can be before all its URLs are
shortened. They can also turn off shortening altogether.

Squashed commit of the following:

commit d136b39011
Author: Evan Prodromou <evan@status.net>
Date:   Mon Apr 26 02:39:00 2010 -0400

    use site and user settings to determine when to shorten URLs

commit 1e1c851ff3
Author: Evan Prodromou <evan@status.net>
Date:   Mon Apr 26 02:38:40 2010 -0400

    add a method to force shortening URLs

commit 4d29ca0b91
Author: Evan Prodromou <evan@status.net>
Date:   Mon Apr 26 02:37:41 2010 -0400

    static method for getting best URL shortening service

commit a9c6a3bace
Author: Evan Prodromou <evan@status.net>
Date:   Mon Apr 26 02:37:11 2010 -0400

    allow 0 in numeric entries in othersettings

commit 767ff2f7ec
Author: Evan Prodromou <evan@status.net>
Date:   Mon Apr 26 02:36:46 2010 -0400

    allow 0 or blank string in inputs

commit 1e21af42a6
Author: Evan Prodromou <evan@status.net>
Date:   Mon Apr 26 02:01:11 2010 -0400

    add more URL-shortening options to othersettings

commit 869a6be0f5
Author: Evan Prodromou <evan@status.net>
Date:   Sat Apr 24 14:22:51 2010 -0400

    move url shortener superclass to lib from plugin

commit 9c0c9863d5
Author: Evan Prodromou <evan@status.net>
Date:   Sat Apr 24 14:20:28 2010 -0400

    documentation and whitespace on UrlShortenerPlugin

commit 7a1dd5798f
Author: Evan Prodromou <evan@status.net>
Date:   Sat Apr 24 14:05:46 2010 -0400

    add defaults for URL shortening

commit d259c37ad2
Author: Evan Prodromou <evan@status.net>
Date:   Sat Apr 24 13:40:10 2010 -0400

    Add User_urlshortener_prefs

    Add a table for URL shortener prefs, a corresponding class, and the
    correct mumbo-jumbo in statusnet.ini to make everything work.
2010-04-26 02:40:36 -04:00
Brion Vibber
64b5ea2e62 Use InnoDB and UTF-8 options when creating user_im_prefs table, to match others 2010-03-24 14:18:06 -07:00
Craig Andrews
714d920fae Merge branch '0.9.x' into 1.0.x
Conflicts:
	classes/statusnet.ini
	db/statusnet.sql
	lib/jabber.php
	lib/xmppmanager.php
2010-03-08 17:22:23 -05:00
Brion Vibber
af04973e9e Roll up some missing items from 08to09.sql; now hits all changed tables/columns/keys in core.
Added partial data conversions:
user_groups -> local_user: ids, names filled out; mainpage, uri left null
notice -> conversation: stub entry added to push the autoincrement past existing notice items
2010-03-04 08:49:04 -08:00
Ciaran Gultnieks
3d2bf5ce20 Create new field in consumer table in 08to09.sql 2010-03-04 08:33:07 -08:00
Brion Vibber
67e4c5d43b Added oauth_appication tables to 08to09.sql
Conflicts:

	db/08to09.sql
2010-03-04 08:32:45 -08:00
Brion Vibber
946445eea9 Add index on group_index.notice_id, needed to pull list of target groups for inbox delivery.
Index was present on live identi.ca database but missing from master definitions: group_inbox_notice_id_idx
2010-03-01 13:09:20 -08:00
Brion Vibber
e529ceee21 Add index on post_id for file_to_post, needed for efficient lookups of files/urls attached to a given post. 2010-03-01 12:20:04 -08:00
Evan Prodromou
00aba4a907 add beta5 to beta6 script 2010-02-25 22:30:04 -05:00
Brion Vibber
8278eca7ff Not sure how this ended up in wrong-cased dir... 2010-02-25 21:15:20 +00:00
Evan Prodromou
8f42d37593 Add 'mainpage' to User_group
Add the mainpage attribute to user_group objects.
2010-02-25 09:24:29 -05:00
Evan Prodromou
bd68154772 Make user_group able to handle remote groups
We add a local_group table to store data about local groups. It has
the unique key for nickname, so /group/<nickname> looks up here.

Updated DB data object classes and data files.
2010-02-24 23:28:41 -05:00
Craig Andrews
c187bf5597 Merge branch '0.9.x' into 1.0.x
Conflicts:
	EVENTS.txt
	db/statusnet.sql
	lib/queuemanager.php
2010-02-24 20:52:45 -05:00
Brion Vibber
5a6cbb248f Merge branch 'testing' into 0.9.x 2010-02-17 10:14:08 -08:00
Zach Copley
ed46a38ecf - conversation.uri needs to be nullable
- factory method for creating new local conversations
2010-02-17 01:11:14 -08:00
Zach Copley
a2f8c5da17 New Conversation DO to handle remote notices as conversation roots 2010-02-16 23:30:08 -08:00
Craig Andrews
32084e33a2 Merge branch '0.9.x' into 1.0.x
Conflicts:
	lib/queuemanager.php
2010-02-16 10:25:57 -05:00
Zach Copley
4180ab74d9 OAuth app name should not be null 2010-02-05 02:09:58 +00:00
Zach Copley
82f1119073 OAuth app name should not be null 2010-02-05 01:24:21 +00:00
Craig Andrews
057ec1fcea Merge branch '0.9.x' into 1.0.x
Conflicts:
	EVENTS.txt
	lib/imqueuehandler.php
	lib/jabber.php
	lib/util.php
	plugins/Xmpp/Sharing_XMPP.php
2010-02-02 17:00:10 -05:00
Zach Copley
8191273078 Better token revocation 2010-02-02 08:50:33 +00:00
Zach Copley
df2a081265 OAuth app names should be unique. 2010-02-02 08:50:01 +00:00
Zach Copley
2be00ce642 Merge branch 'oauth-continued' into 0.9.x 2010-02-02 08:48:52 +00:00
Zach Copley
f1094185e4 Better token revocation 2010-02-02 07:35:54 +00:00
Ciaran Gultnieks
952b580698 Create new field in consumer table in 08to09.sql 2010-02-01 21:05:50 +00:00
Zach Copley
59d16cf16a OAuth app names should be unique. 2010-02-01 20:58:30 +00:00
Ciaran Gultnieks
85544d369d Added oauth_appication tables to 08to09.sql 2010-02-01 17:28:15 +00:00
Craig Andrews
914bc9f9c5 Merge branch '0.9.x' into 1.0.x
Conflicts:
	lib/queuemanager.php
2010-01-27 22:07:04 -05:00
Brion Vibber
07d50a012a fix update script -- read the diff wrong and put a couple fields on wrong table (whoops) 2010-01-27 17:34:13 -08:00
Brion Vibber
9a54745fcd Rename rc3to09.sql to rc3torc4.sql to avoid confusion if we add a last-minute change after this! 2010-01-27 13:59:58 -08:00
Brion Vibber
47645228da Add new oauth tables and modifications to 'consumer' table for rc4 2010-01-27 13:58:55 -08:00
Craig Andrews
e9995b0f6a Create IM plugin, Pluginize XMPP, Create AIM plugin 2010-01-27 13:48:35 -05:00
Brion Vibber
ad6f0501ff Site metadata tags in status_network: single 'tags' field, pipe-separated.
$sn->tags() returns tag list as array; $sn->hasTag('blah') to check for a particular tag only

Could be used to control things in config file:

  $sn = Status_network::setupSite($_server, $_path, $_wildcard);
  if (!$sn) { die("No such site"); }
  if ($sn->hasTag('individual')) { /* blah */ }

Note memcached keys are unchanged; if tags are changed from an external tool clear:
  statusnet:<dbname>:status_network:<key>:<val>
  for <key>s 'nickname', 'hostname', and 'pathname'
2010-01-26 10:33:20 -08:00
Zach Copley
6efbf2777a Add verifier and verified callback to token for OAuth 1.0a 2010-01-24 16:36:05 -08:00
Zach Copley
d33040089d Remove verifier from Oauth_application_user (not needed there) 2010-01-24 16:36:05 -08:00
Zach Copley
7694955cd6 Callback URL can be null 2010-01-24 16:36:04 -08:00
Zach Copley
c2337ab47c Decided we didn't need to keep the token secret in the
Oauth_application_user record
2010-01-24 16:36:02 -08:00
Zach Copley
c473a39a7d Associate request tokens with OAuth apps and app users 2010-01-24 16:36:02 -08:00
Zach Copley
3c2b05d222 Workflow for registering new OAuth apps pretty much done. 2010-01-24 16:36:02 -08:00
Zach Copley
efd84cadc0 Changed the OAuth app tables to refer to profiles instead of users.
Added an owner column to oauth_application.
2010-01-24 16:36:01 -08:00
Zach Copley
c0b832d19f Add new OAuth application tables and DataObjects. Also add a new
column for consumer secret to consumer table.
2010-01-24 16:36:01 -08:00
Evan Prodromou
c8bc598cfd Merge branch 'testing' into 0.9.x 2010-01-22 14:18:43 -05:00
Brion Vibber
0e852def6a XMPP queued output & initial retooling of DB queue manager to support non-Notice objects.
Queue handlers for XMPP individual & firehose output now send their XML stanzas
to another output queue instead of connecting directly to the chat server. This
lets us have as many general processing threads as we need, while all actual
XMPP input and output go through a single daemon with a single connection open.

This avoids problems with multiple connected resources:
* multiple windows shown in some chat clients (psi, gajim, kopete)
* extra load on server
* incoming message delivery forwarding issues

Database changes:
* queue_item drops 'notice_id' in favor of a 'frame' blob.
  This is based on Craig Andrews' work branch to generalize queues to take any
  object, but conservatively leaving out the serialization for now.
  Table updater (preserves any existing queued items) in db/rc3to09.sql

Code changes to watch out for:
* Queue handlers should now define a handle() method instead of handle_notice()
* QueueDaemon and XmppDaemon now share common i/o (IoMaster) and respawning
  thread management (RespawningDaemon) infrastructure.
* The polling XmppConfirmManager has been dropped, as the message is queued
  directly when saving IM settings.
* Enable $config['queue']['debug_memory'] to output current memory usage at
  each run through the event loop to watch for memory leaks

To do:
* Adapt XMPP i/o to component connection mode for multi-site support.
* XMPP input can also be broken out to a queue, which would allow the actual
  notice save etc to be handled by general queue threads.
* Make sure there are no problems with simply pushing serialized Notice objects
  to queues.
* Find a way to improve interactive performance of the database-backed queue
  handler; polling is pretty painful to XMPP.
* Possibly redo the way QueueHandlers are injected into a QueueManager. The
  grouping used to split out the XMPP output queue is a bit awkward.
2010-01-21 22:40:35 -08:00
Zach Copley
ee8c1ec91c Add verifier and verified callback to token for OAuth 1.0a 2010-01-14 02:41:10 +00:00
Zach Copley
ead1ef4c68 Remove verifier from Oauth_application_user (not needed there) 2010-01-14 02:41:10 +00:00
Zach Copley
4cfc71f4e0 Callback URL can be null 2010-01-14 02:41:08 +00:00
Zach Copley
bfe3e3c74e Decided we didn't need to keep the token secret in the
Oauth_application_user record
2010-01-14 02:41:06 +00:00
Zach Copley
e7f4ab6774 Associate request tokens with OAuth apps and app users 2010-01-14 02:41:05 +00:00
Zach Copley
dad67b030f Workflow for registering new OAuth apps pretty much done. 2010-01-14 02:41:04 +00:00
Zach Copley
6e64ce3777 Changed the OAuth app tables to refer to profiles instead of users.
Added an owner column to oauth_application.
2010-01-14 02:41:04 +00:00
Zach Copley
14bcac31b8 Add new OAuth application tables and DataObjects. Also add a new
column for consumer secret to consumer table.
2010-01-14 02:41:04 +00:00
Evan Prodromou
8d6b4cadf3 script to upgrade from RC2 to RC3 2010-01-13 17:28:31 -08:00
Evan Prodromou
ecb3abf84c Merge branch '0.9.x' into inblob 2010-01-11 16:28:27 -08:00
Brenda Wallace
42896ac1fb fixed stray comma 2010-01-10 14:04:18 +13:00
Brenda Wallace
dc89adb36d Revert "fixed stay comma"
This reverts commit 2b273be400.
2010-01-10 14:04:01 +13:00
Brenda Wallace
2b273be400 fixed stay comma 2010-01-10 14:03:42 +13:00
Evan Prodromou
922db17259 add an inbox blob table 2010-01-09 10:01:20 -08:00
Evan Prodromou
b141f7aea5 Add user_location_prefs to upgrade script 2009-12-28 13:54:09 -08:00
Evan Prodromou
8d4e617d4e add table user_location_prefs 2009-12-28 13:53:28 -08:00
Brenda Wallace
b9b8e08c10 fix typo / parse error in sql comment syntax 2009-12-13 11:54:05 +13:00
Evan Prodromou
3d06431787 add repeat_of column to notice table 2009-12-11 10:20:32 -05:00
Evan Prodromou
344c99df02 remove forward table from PostgreSQL scripts 2009-12-10 14:40:00 -05:00
Evan Prodromou
dd098fee77 remove forward table from db scripts 2009-12-10 14:34:47 -05:00
Brenda Wallace
3e9c2d779a add missing table "forward" 2009-12-09 13:12:29 +13:00
Brenda Wallace
b139be6caf added missing table: location_namespace 2009-12-09 13:09:38 +13:00
Evan Prodromou
5344b3fb4b add forward table to updates 2009-12-08 17:32:09 -05:00
Evan Prodromou
add126bc6c add forward table 2009-12-08 14:56:11 -05:00
Craig Andrews
75cac0fd6b Added 'login' command that gives you a link that can be used to login to the website 2009-12-05 21:05:33 -05:00
Brion Vibber
8b63717bf9 ticket 1100: add Drupal source link 2009-12-01 12:55:55 -08:00
Zach Copley
9dc888894b Merge branch 'master' into 0.9.x
* master: (67 commits)
  Ticket 2038: fix bad bug tracker link
  Fix regression in group posting: bug introduced in commit 1319002e15. Need to use actual profile object rather than an id on a variable that doesn't exist when checking blocks :D
  Log database errors when saving notice_inbox entries
  Drop the username from the log id for now; seems to trigger an error loop in some circumstances
  request id on logs... pid + random id per web request + username + method + url
  Add OpenID ini info back into statusnet.ini as a stopgap until we can
  Some changes to the OpenID DataObjects to make them emit the exact same
  OpenID plugin should set 'user_openid.display' as unique key
  Remove relationship: user_openid.user_id -> user.id. I don't think this
  Have OpenID plugin DataObjects emit their own .ini info
  Revert "Allow plugin DB_DataObject classes to not have to use the .ini file by overriding keys(), table(), and sequenceKey() for them"
  Catch and report exceptions from notice_to_omb_notice() instead of letting the OMB queue handler die.
  Fix regression in remote subscription; added hasRole() shadow method on Remote_profile.
  Fix fatal error on OMB subscription for first-timers
  Remove annoying log msg
  Drop error message on setlocale() failure; this is harmless, since we actually have a working locale set up.
  Catch uncaught exception
  Fixed bug where reply-sync bit wasn't getting saved
  Forgot to render the nav menu when on FB Connect login tab
  Facebook plugin no longer takes over Login and Connect settings nav menus
  ...

Conflicts:
	db/08to09_pg.sql
	db/statusnet_pg.sql
	locale/pt_BR/LC_MESSAGES/statusnet.mo
	plugins/Mapstraction/MapstractionPlugin.php
2009-11-30 10:28:58 -08:00
Brenda Wallace
8d502c4b8e added missing columns from mysql upgrade script into pgsql script 2009-11-26 20:35:41 +13:00