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

Merge branch 'master' into 'nightly' 

make events federate

See merge request !33
This commit is contained in:
mmn 2015-10-09 14:43:45 +00:00
parent dd149a76f3 61ed36e446
commit 3154302b53
3 changed files with 40 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
plugins/Event/EventPlugin.php
View File

@ -46,6 +46,9 @@ if (!defined('STATUSNET')) {
*/
class EventPlugin extends MicroAppPlugin
{
var $oldSaveNew = true;
/**
* Set up our tables (event and rsvp)
*
@ -142,18 +145,44 @@ class EventPlugin extends MicroAppPlugin
throw new Exception(_m('Wrong type for object.'));
}
$dtstart = $happeningObj->element->getElementsByTagName('dtstart');
if($dtstart->length == 0) {
// TRANS: Exception thrown when has no start date
throw new Exception(_m('No start date for event.'));
}
$dtend = $happeningObj->element->getElementsByTagName('dtend');
if($dtend->length == 0) {
// TRANS: Exception thrown when has no end date
throw new Exception(_m('No end date for event.'));
}
// location is optional
$location = null;
$location_object = $happeningObj->element->getElementsByTagName('location');
if($location_object->length > 0) {
$location = $location_object->item(0)->nodeValue;
}
// url is optional
$url = null;
$url_object = $happeningObj->element->getElementsByTagName('url');
if($url_object->length > 0) {
$url = $url_object->item(0)->nodeValue;
}
$notice = null;
switch ($activity->verb) {
case ActivityVerb::POST:
// FIXME: get startTime, endTime, location and URL
$notice = Happening::saveNew($actor,
$start_time,
$end_time,
$dtstart->item(0)->nodeValue,
$dtend->item(0)->nodeValue,
$happeningObj->title,
null,
$location,
$happeningObj->summary,
null,
$url,
$options);
break;
case RSVP::POSITIVE:
@ -228,9 +257,9 @@ class EventPlugin extends MicroAppPlugin
array('xmlns' => 'urn:ietf:params:xml:ns:xcal'),
common_date_iso8601($happening->end_time));
// FIXME: add location
// FIXME: add URL
$obj->extra[] = array('location', false, $happening->location);
$obj->extra[] = array('url', false, $happening->url);
// XXX: probably need other stuff here
return $obj;

4
plugins/Event/actions/newevent.php
View File

@ -220,8 +220,8 @@ class NeweventAction extends Action
$profile = $this->user->getProfile();
$saved = Happening::saveNew($profile,
$this->startTime,
$this->endTime,
common_sql_date($this->startTime),
common_sql_date($this->endTime),
$this->title,
$this->location,
$this->description,

4
plugins/Event/classes/Happening.php
View File

@ -116,8 +116,8 @@ class Happening extends Managed_DataObject
$ev->id = UUID::gen();
$ev->profile_id = $profile->id;
$ev->start_time = common_sql_date($start_time);
$ev->end_time = common_sql_date($end_time);
$ev->start_time = $start_time;
$ev->end_time = $end_time;
$ev->title = $title;
$ev->location = $location;
$ev->description = $description;