Merge branch '1.4' into shard-process

src/NadekoBot/Services/IBotCredentials.cs

@@ -16,7 +16,6 @@ namespace NadekoBot.Services
         string CarbonKey { get; }
 
         DBConfig Db { get; }
-        string SoundCloudClientId { get; }
         string OsuApiKey { get; }
 
         bool IsOwner(IUser u);

src/NadekoBot/Services/Impl/BotCredentials.cs

@@ -25,17 +25,6 @@ namespace NadekoBot.Services.Impl
 
         public string LoLApiKey { get; }
         public string OsuApiKey { get; }
-        private string _soundcloudClientId;
-        public string SoundCloudClientId {
-            get {
-                return string.IsNullOrWhiteSpace(_soundcloudClientId)
-                    ? "d0bd7768e3a1a2d15430f0dccb871117"
-                    : _soundcloudClientId;
-            }
-            private set {
-                _soundcloudClientId = value;
-            }
-        }
 
         public DBConfig Db { get; }
         public int TotalShards { get; }
@@ -81,8 +70,8 @@ namespace NadekoBot.Services.Impl
                 ulong.TryParse(data[nameof(ClientId)], out clId);
                 ClientId = clId;
 
-                var scId = data[nameof(SoundCloudClientId)];
-                SoundCloudClientId = scId;
+                //var scId = data[nameof(SoundCloudClientId)];
+                //SoundCloudClientId = scId;
                 //SoundCloudClientId = string.IsNullOrWhiteSpace(scId)
                 //    ? 
                 //    : scId;

src/NadekoBot/Services/Music/SoundCloudApiService.cs

@@ -19,8 +19,6 @@ namespace NadekoBot.Services.Music
         {
             if (string.IsNullOrWhiteSpace(url))
                 throw new ArgumentNullException(nameof(url));
-            if (string.IsNullOrWhiteSpace(_creds.SoundCloudClientId))
-                throw new ArgumentNullException(nameof(_creds.SoundCloudClientId));
 
             string response = "";
 
@@ -44,8 +42,6 @@ namespace NadekoBot.Services.Music
         {
             if (string.IsNullOrWhiteSpace(query))
                 throw new ArgumentNullException(nameof(query));
-            if (string.IsNullOrWhiteSpace(_creds.SoundCloudClientId))
-                throw new ArgumentNullException(nameof(_creds.SoundCloudClientId));
 
             var response = "";
             using (var http = new HttpClient())

src/NadekoBot/Services/Permissions/FilterService.cs

@@ -67,7 +67,7 @@ namespace NadekoBot.Services.Permissions
         public async Task<bool> TryBlockEarly(IGuild guild, IUserMessage msg)
             =>  !(msg.Author is IGuildUser gu) //it's never filtered outside of guilds, and never block administrators
                 ? false
-                : gu.GuildPermissions.Administrator && (await FilterInvites(guild, msg) || await FilterWords(guild, msg));
+                : !gu.GuildPermissions.Administrator && (await FilterInvites(guild, msg) || await FilterWords(guild, msg));
 
         public async Task<bool> FilterWords(IGuild guild, IUserMessage usrMsg)
         {