Reorganized basic permissions handling to be more cleanly extensible.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3375 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2005-03-02 03:22:27 +00:00
parent 713e76373b
commit 01592d2593
5 changed files with 17 additions and 72 deletions
@@ -34,6 +34,10 @@ public interface ChatCodes extends InvocationCodes
/** The message identifier for a chat notification message. */
public static final String CHAT_NOTIFICATION = "chat";
/** The access control identifier for broadcast chat privileges. See
* {@link BodyObject#checkAccess}. */
public static final String BROADCAST_ACCESS = "crowd.chat.broadcast";
/** The configuration key for idle time. */
public static final String IDLE_TIME_KEY = "narya.chat.idle_time";
@@ -40,7 +40,6 @@ import com.threerings.presents.server.InvocationProvider;
import com.threerings.crowd.data.BodyObject;
import com.threerings.crowd.data.OccupantInfo;
import com.threerings.crowd.data.PlaceObject;
import com.threerings.crowd.server.AccessControl;
import com.threerings.crowd.server.CrowdServer;
import com.threerings.crowd.chat.client.ChatService.TellListener;
@@ -55,9 +54,6 @@ import com.threerings.crowd.chat.data.UserMessage;
public class ChatProvider
implements ChatCodes, InvocationProvider
{
/** The access control identifier for broadcast chat privileges. */
public static final String BROADCAST_TOKEN = "crowd.chat.broadcast";
/** Interface to allow an auto response to a tell message. */
public static interface TellAutoResponder
{
@@ -170,8 +166,8 @@ public class ChatProvider
BodyObject body = (BodyObject)caller;
// make sure the requesting user has broadcast privileges
if (!CrowdServer.actrl.checkAccess(body, BROADCAST_TOKEN)) {
throw new InvocationException(AccessControl.LACK_ACCESS);
if (!body.checkAccess(BROADCAST_ACCESS, null)) {
throw new InvocationException(ACCESS_DENIED);
}
broadcast(body.username, null, message, false);