@@ -61,6 +61,17 @@ function isOwner(next) {
61
61
} ;
62
62
}
63
63
64
+ function isInvited ( next ) {
65
+ return function ( socket , data , callback ) {
66
+ groups . isInvited ( socket . uid , data . groupName , function ( err , invited ) {
67
+ if ( err || ! invited ) {
68
+ return callback ( err || new Error ( '[[error:not-invited]]' ) ) ;
69
+ }
70
+ next ( socket , data , callback ) ;
71
+ } ) ;
72
+ } ;
73
+ }
74
+
64
75
SocketGroups . grant = isOwner ( function ( socket , data , callback ) {
65
76
groups . ownership . grant ( data . toUid , data . groupName , callback ) ;
66
77
} ) ;
@@ -106,25 +117,13 @@ SocketGroups.rescindInvite = isOwner(function(socket, data, callback) {
106
117
groups . rejectMembership ( data . groupName , data . toUid , callback ) ;
107
118
} ) ;
108
119
109
- SocketGroups . acceptInvite = function ( socket , data , callback ) {
110
- groups . isInvited ( socket . uid , data . groupName , function ( err , invited ) {
111
- if ( err || ! invited ) {
112
- return callback ( err || new Error ( '[[error:no-privileges]]' ) ) ;
113
- }
114
-
115
- groups . acceptMembership ( data . groupName , socket . uid , callback ) ;
116
- } ) ;
117
- } ;
118
-
119
- SocketGroups . rejectInvite = function ( socket , data , callback ) {
120
- groups . isInvited ( socket . uid , data . groupName , function ( err , invited ) {
121
- if ( err || ! invited ) {
122
- return callback ( err || new Error ( '[[error:no-privileges]]' ) ) ;
123
- }
120
+ SocketGroups . acceptInvite = isInvited ( function ( socket , data , callback ) {
121
+ groups . acceptMembership ( data . groupName , socket . uid , callback ) ;
122
+ } ) ;
124
123
125
- groups . rejectMembership ( data . groupName , socket . uid , callback ) ;
126
- } ) ;
127
- } ;
124
+ SocketGroups . rejectInvite = isInvited ( function ( socket , data , callback ) {
125
+ groups . rejectMembership ( data . groupName , socket . uid , callback ) ;
126
+ } ) ;
128
127
129
128
SocketGroups . update = isOwner ( function ( socket , data , callback ) {
130
129
groups . update ( data . groupName , data . values , callback ) ;
0 commit comments