GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Using some Managed_DataObject::getByPK calls for consistency

Browse Source
This commit is contained in:
Mikael Nordfeldth 2015-10-10 21:40:02 +02:00
parent 37f2da03e1
commit 18f07a48e8
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/ActivityModeration/classes/Deleted_notice.php
View File

@ -99,12 +99,7 @@ class Deleted_notice extends Managed_DataObject
static public function fromStored(Notice $stored) static public function fromStored(Notice $stored)
{ {
$class = get_called_class(); $class = get_called_class();
$object = new $class; return self::getByPK(array('uri', $stored->getUri()));
$object->uri = $stored->getUri(); // Lookup by delete activity's URI! (that's what is _stored_ in our db!)
if (!$object->find(true)) {
throw new NoResultException($object);
}
return $object;
} }
// The one who deleted the notice, not the notice's author // The one who deleted the notice, not the notice's author

15
plugins/Bookmark/classes/Bookmark.php
View File

@ -27,9 +27,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
if (!defined('STATUSNET')) { if (!defined('GNUSOCIAL')) { exit(1); }
exit(1);
}
/** /**
* For storing the fact that a notice is a bookmark * For storing the fact that a notice is a bookmark
@ -77,6 +75,7 @@ class Bookmark extends Managed_DataObject
), ),
'foreign keys' => array( 'foreign keys' => array(
'bookmark_profile_id_fkey' => array('profile', array('profile_id' => 'id')) 'bookmark_profile_id_fkey' => array('profile', array('profile_id' => 'id'))
'bookmark_uri_fkey' => array('notice', array('uri' => 'uri'))
), ),
'indexes' => array('bookmark_created_idx' => array('created'), 'indexes' => array('bookmark_created_idx' => array('created'),
'bookmark_url_idx' => array('url'), 'bookmark_url_idx' => array('url'),
@ -88,13 +87,15 @@ class Bookmark extends Managed_DataObject
/** /**
* Get a bookmark based on a notice * Get a bookmark based on a notice
* *
* @param Notice $notice Notice to check for * @param Notice $stored Notice activity which represents the Bookmark
* *
* @return Bookmark found bookmark or null * @return Bookmark The found bookmark object.
* @throws NoResultException When you don't find it after all.
*/ */
static function getByNotice($notice) static public function fromStored(Notice $stored)
{ {
return self::getKV('uri', $notice->uri); $class = get_called_class();
return self::getByPK(array('uri', $stored->getUri()));
} }
/** /**