Added UsePermissionsCache config, fixed a few permission bugs
This commit is contained in:
@@ -83,6 +83,9 @@ namespace Discord
|
|||||||
/// <summary> Gets or sets the number of messages per channel that should be kept in cache. Setting this to zero disables the message cache entirely. </summary>
|
/// <summary> Gets or sets the number of messages per channel that should be kept in cache. Setting this to zero disables the message cache entirely. </summary>
|
||||||
public int MessageCacheSize { get { return _messageCacheSize; } set { SetValue(ref _messageCacheSize, value); } }
|
public int MessageCacheSize { get { return _messageCacheSize; } set { SetValue(ref _messageCacheSize, value); } }
|
||||||
private int _messageCacheSize = 100;
|
private int _messageCacheSize = 100;
|
||||||
|
/// <summary> Gets or sets whether the permissions cache should be used. This makes operations such as User.GetPermissions(Channel), User.ServerPermissions and Channel.Members </summary>
|
||||||
|
public bool UsePermissionsCache { get { return _usePermissionsCache; } set { SetValue(ref _usePermissionsCache, value); } }
|
||||||
|
private bool _usePermissionsCache = true;
|
||||||
/// <summary> Maintains the LastActivity property for users, showing when they last made an action (sent message, joined server, typed, etc). </summary>
|
/// <summary> Maintains the LastActivity property for users, showing when they last made an action (sent message, joined server, typed, etc). </summary>
|
||||||
public bool TrackActivity { get { return _trackActivity; } set { SetValue(ref _trackActivity, value); } }
|
public bool TrackActivity { get { return _trackActivity; } set { SetValue(ref _trackActivity, value); } }
|
||||||
private bool _trackActivity = true;
|
private bool _trackActivity = true;
|
||||||
|
|||||||
@@ -68,11 +68,29 @@ namespace Discord
|
|||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
|
if (IsPrivate)
|
||||||
|
return _members.Values.Select(x => x.User);
|
||||||
|
if (_client.Config.UsePermissionsCache)
|
||||||
|
{
|
||||||
if (Type == ChannelType.Text)
|
if (Type == ChannelType.Text)
|
||||||
return _members.Values.Where(x => x.Permissions.ReadMessages == true).Select(x => x.User);
|
return _members.Values.Where(x => x.Permissions.ReadMessages == true).Select(x => x.User);
|
||||||
else if (Type == ChannelType.Voice)
|
else if (Type == ChannelType.Voice)
|
||||||
return _members.Values.Select(x => x.User).Where(x => x.VoiceChannel == this);
|
return _members.Values.Select(x => x.User).Where(x => x.VoiceChannel == this);
|
||||||
|
}
|
||||||
else
|
else
|
||||||
|
{
|
||||||
|
if (Type == ChannelType.Text)
|
||||||
|
{
|
||||||
|
ChannelPermissions perms = new ChannelPermissions();
|
||||||
|
return Server.Members.Where(x =>
|
||||||
|
{
|
||||||
|
UpdatePermissions(x, perms);
|
||||||
|
return perms.ReadMessages == true;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
else if (Type == ChannelType.Voice)
|
||||||
|
return Server.Members.Where(x => x.VoiceChannel == this);
|
||||||
|
}
|
||||||
return Enumerable.Empty<User>();
|
return Enumerable.Empty<User>();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -191,17 +209,25 @@ namespace Discord
|
|||||||
|
|
||||||
internal void AddMember(User user)
|
internal void AddMember(User user)
|
||||||
{
|
{
|
||||||
|
if (!_client.Config.UsePermissionsCache)
|
||||||
|
return;
|
||||||
|
|
||||||
var member = new ChannelMember(user);
|
var member = new ChannelMember(user);
|
||||||
if (_members.TryAdd(user.Id, member))
|
if (_members.TryAdd(user.Id, member))
|
||||||
UpdatePermissions(user, member.Permissions);
|
UpdatePermissions(user, member.Permissions);
|
||||||
}
|
}
|
||||||
internal void RemoveMember(User user)
|
internal void RemoveMember(User user)
|
||||||
{
|
{
|
||||||
|
if (!_client.Config.UsePermissionsCache)
|
||||||
|
return;
|
||||||
|
|
||||||
ChannelMember ignored;
|
ChannelMember ignored;
|
||||||
_members.TryRemove(user.Id, out ignored);
|
_members.TryRemove(user.Id, out ignored);
|
||||||
}
|
}
|
||||||
|
|
||||||
internal ChannelPermissions GetPermissions(User user)
|
internal ChannelPermissions GetPermissions(User user)
|
||||||
|
{
|
||||||
|
if (_client.Config.UsePermissionsCache)
|
||||||
{
|
{
|
||||||
ChannelMember member;
|
ChannelMember member;
|
||||||
if (_members.TryGetValue(user.Id, out member))
|
if (_members.TryGetValue(user.Id, out member))
|
||||||
@@ -209,8 +235,18 @@ namespace Discord
|
|||||||
else
|
else
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
ChannelPermissions perms = new ChannelPermissions();
|
||||||
|
UpdatePermissions(user, perms);
|
||||||
|
return perms;
|
||||||
|
}
|
||||||
|
}
|
||||||
internal void UpdatePermissions()
|
internal void UpdatePermissions()
|
||||||
{
|
{
|
||||||
|
if (!_client.Config.UsePermissionsCache)
|
||||||
|
return;
|
||||||
|
|
||||||
foreach (var pair in _members)
|
foreach (var pair in _members)
|
||||||
{
|
{
|
||||||
ChannelMember member = pair.Value;
|
ChannelMember member = pair.Value;
|
||||||
@@ -219,11 +255,14 @@ namespace Discord
|
|||||||
}
|
}
|
||||||
internal void UpdatePermissions(User user)
|
internal void UpdatePermissions(User user)
|
||||||
{
|
{
|
||||||
|
if (!_client.Config.UsePermissionsCache)
|
||||||
|
return;
|
||||||
|
|
||||||
ChannelMember member;
|
ChannelMember member;
|
||||||
if (_members.TryGetValue(user.Id, out member))
|
if (_members.TryGetValue(user.Id, out member))
|
||||||
UpdatePermissions(member.User, member.Permissions);
|
UpdatePermissions(member.User, member.Permissions);
|
||||||
}
|
}
|
||||||
private void UpdatePermissions(User user, ChannelPermissions permissions)
|
internal void UpdatePermissions(User user, ChannelPermissions permissions)
|
||||||
{
|
{
|
||||||
uint newPermissions = 0;
|
uint newPermissions = 0;
|
||||||
var server = Server;
|
var server = Server;
|
||||||
@@ -236,7 +275,7 @@ namespace Discord
|
|||||||
//Start with this user's server permissions
|
//Start with this user's server permissions
|
||||||
newPermissions = server.GetPermissions(user).RawValue;
|
newPermissions = server.GetPermissions(user).RawValue;
|
||||||
|
|
||||||
if (IsPrivate || server.Owner == user)
|
if (IsPrivate || user.IsOwner)
|
||||||
newPermissions = mask; //Owners always have all permissions
|
newPermissions = mask; //Owners always have all permissions
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -263,6 +302,7 @@ namespace Discord
|
|||||||
else
|
else
|
||||||
newPermissions = mask; //Private messages always have all permissions
|
newPermissions = mask; //Private messages always have all permissions
|
||||||
|
|
||||||
|
if (newPermissions != permissions.RawValue)
|
||||||
permissions.SetRawValueInternal(newPermissions);
|
permissions.SetRawValueInternal(newPermissions);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -38,14 +38,11 @@ namespace Discord
|
|||||||
/// <summary> Returns the URL to this user's current avatar. </summary>
|
/// <summary> Returns the URL to this user's current avatar. </summary>
|
||||||
public string IconUrl => IconId != null ? Endpoints.ServerIcon(Id, IconId) : null;
|
public string IconUrl => IconId != null ? Endpoints.ServerIcon(Id, IconId) : null;
|
||||||
|
|
||||||
/// <summary> Returns true if the current user created this server. </summary>
|
|
||||||
public bool IsOwner => _client.CurrentUser.Id == _owner.Id;
|
|
||||||
|
|
||||||
/// <summary> Returns the user that first created this server. </summary>
|
/// <summary> Returns the user that first created this server. </summary>
|
||||||
[JsonIgnore]
|
[JsonIgnore]
|
||||||
public User Owner => _owner.Value;
|
public User Owner => _owner.Value;
|
||||||
[JsonProperty]
|
[JsonProperty]
|
||||||
private long? OwnerId => _owner.Id;
|
internal long? OwnerId => _owner.Id;
|
||||||
private Reference<User> _owner;
|
private Reference<User> _owner;
|
||||||
|
|
||||||
/// <summary> Returns the AFK voice channel for this server (see AFKTimeout). </summary>
|
/// <summary> Returns the AFK voice channel for this server (see AFKTimeout). </summary>
|
||||||
@@ -110,6 +107,7 @@ namespace Discord
|
|||||||
internal override bool LoadReferences()
|
internal override bool LoadReferences()
|
||||||
{
|
{
|
||||||
_afkChannel.Load();
|
_afkChannel.Load();
|
||||||
|
_owner.Load();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
internal override void UnloadReferences()
|
internal override void UnloadReferences()
|
||||||
@@ -279,10 +277,9 @@ namespace Discord
|
|||||||
}
|
}
|
||||||
private void UpdatePermissions(User user, ServerPermissions permissions)
|
private void UpdatePermissions(User user, ServerPermissions permissions)
|
||||||
{
|
{
|
||||||
uint oldPermissions = permissions.RawValue;
|
|
||||||
uint newPermissions = 0;
|
uint newPermissions = 0;
|
||||||
|
|
||||||
if (Owner == user)
|
if (user.IsOwner)
|
||||||
newPermissions = ServerPermissions.All.RawValue;
|
newPermissions = ServerPermissions.All.RawValue;
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -294,7 +291,7 @@ namespace Discord
|
|||||||
if (BitHelper.GetBit(newPermissions, (int)PermissionsBits.ManageRolesOrPermissions))
|
if (BitHelper.GetBit(newPermissions, (int)PermissionsBits.ManageRolesOrPermissions))
|
||||||
newPermissions = ServerPermissions.All.RawValue;
|
newPermissions = ServerPermissions.All.RawValue;
|
||||||
|
|
||||||
if (newPermissions != oldPermissions)
|
if (newPermissions != permissions.RawValue)
|
||||||
{
|
{
|
||||||
permissions.SetRawValueInternal(newPermissions);
|
permissions.SetRawValueInternal(newPermissions);
|
||||||
foreach (var channel in _channels)
|
foreach (var channel in _channels)
|
||||||
|
|||||||
Reference in New Issue
Block a user