summaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-01-13 02:16:13 -0800
committerEvan Prodromou <evan@status.net>2010-01-13 02:16:13 -0800
commit430bd69312a27f9f97bda78566a78c9f7eec1f14 (patch)
treee5f043e4356e8523b0978a9e35cb602af8dbf60b /actions
parent23599da91e9d4abbd6e73ef3f44c58f302a5231a (diff)
add events for subscribing to people and joining groups
Diffstat (limited to 'actions')
-rw-r--r--actions/joingroup.php16
-rw-r--r--actions/leavegroup.php21
2 files changed, 13 insertions, 24 deletions
diff --git a/actions/joingroup.php b/actions/joingroup.php
index 05e33e7cb..235e5ab4c 100644
--- a/actions/joingroup.php
+++ b/actions/joingroup.php
@@ -115,16 +115,12 @@ class JoingroupAction extends Action
$cur = common_current_user();
- $member = new Group_member();
-
- $member->group_id = $this->group->id;
- $member->profile_id = $cur->id;
- $member->created = common_sql_now();
-
- $result = $member->insert();
-
- if (!$result) {
- common_log_db_error($member, 'INSERT', __FILE__);
+ try {
+ if (Event::handle('StartJoinGroup', array($this->group, $cur))) {
+ Group_member::join($this->group->id, $cur->id);
+ Event::handle('EndJoinGroup', array($this->group, $cur));
+ }
+ } catch (Exception $e) {
$this->serverError(sprintf(_('Could not join user %1$s to group %2$s.'),
$cur->nickname, $this->group->nickname));
}
diff --git a/actions/leavegroup.php b/actions/leavegroup.php
index b0f973e1a..9b9d83b6c 100644
--- a/actions/leavegroup.php
+++ b/actions/leavegroup.php
@@ -110,22 +110,15 @@ class LeavegroupAction extends Action
$cur = common_current_user();
- $member = new Group_member();
-
- $member->group_id = $this->group->id;
- $member->profile_id = $cur->id;
-
- if (!$member->find(true)) {
- $this->serverError(_('Could not find membership record.'));
- return;
- }
-
- $result = $member->delete();
-
- if (!$result) {
- common_log_db_error($member, 'DELETE', __FILE__);
+ try {
+ if (Event::handle('StartLeaveGroup', array($this->group, $cur))) {
+ Group_member::leave($this->group->id, $cur->id);
+ Event::handle('EndLeaveGroup', array($this->group, $cur));
+ }
+ } catch (Exception $e) {
$this->serverError(sprintf(_('Could not remove user %1$s from group %2$s.'),
$cur->nickname, $this->group->nickname));
+ return;
}
if ($this->boolean('ajax')) {