diff --git a/.deploy/poisncopy.service b/.deploy/poisncopy.service new file mode 100644 index 0000000..1bbc8dd --- /dev/null +++ b/.deploy/poisncopy.service @@ -0,0 +1,15 @@ +[Unit] +Description=PoisnCopy application service +[Service] +WorkingDirectory=/var/www/poisncopy +ExecStart=/usr/bin/dotnet /var/www/poisncopy/PoisnCopy.dll +Restart=always +#Restart service after 10 seconds if the dotnet service crashes: +RestartSec=10 +KillSignal=SIGINT +SyslogIdentifier=poisncopy +User=www-data +Environment=ASPNETCORE_ENVIRONMENT=Production +Environment=DOTNET_PRINT_TELEMETRY_MESSAGE=false +[Install] +WantedBy=multi-user.target \ No newline at end of file diff --git a/Commands/BasicCommandsModule.cs b/Commands/BasicCommandsModule.cs index 182f787..cda7366 100644 --- a/Commands/BasicCommandsModule.cs +++ b/Commands/BasicCommandsModule.cs @@ -3,65 +3,65 @@ using DSharpPlus.CommandsNext.Attributes; using DSharpPlus.Entities; using DSharpPlus.Interactivity; +using DSharpPlus.Interactivity.Extensions; using System; using System.Threading.Tasks; -namespace PoisnCopy.Commands -{ - public class BasicCommandsModule : IModule - { - /* Commands in DSharpPlus.CommandsNext are identified by supplying a Command attribute to a method in any class you've loaded into it. */ - /* The description is just a string supplied when you use the help command included in CommandsNext. */ +namespace PoisnCopy.Commands; - [Command("connections")] - [Description("Simple command to see how many servers the bot is on.")] - public async Task Connections(CommandContext ctx) - { - await ctx.TriggerTypingAsync(); +public class BasicCommandsModule : BaseCommandModule, IModule +{ + /* Commands in DSharpPlus.CommandsNext are identified by supplying a Command attribute to a method in any class you've loaded into it. */ + /* The description is just a string supplied when you use the help command included in CommandsNext. */ - var connections = ctx.Client.Guilds; - await ctx.RespondAsync($"I am running on {connections} servers"); - } + [Command("connections")] + [Description("Simple command to see how many servers the bot is on.")] + public async Task Connections(CommandContext ctx) + { + await ctx.TriggerTypingAsync(); - [Command("alive")] - [Description("Simple command to test if the bot is running!")] - public async Task Alive(CommandContext ctx) - { - /* Trigger the Typing... in discord */ - await ctx.TriggerTypingAsync(); + var connections = ctx.Client.Guilds; + await ctx.RespondAsync($"I am running on {connections.ToList().Count} servers"); + } - /* Send the message "I'm Alive!" to the channel the message was recieved from */ - await ctx.RespondAsync("I'm alive!"); - } + [Command("alive")] + [Description("Simple command to test if the bot is running!")] + public async Task Alive(CommandContext ctx) + { + /* Trigger the Typing... in discord */ + await ctx.TriggerTypingAsync(); - [Command("interact")] - [Description("Simple command to test interaction!")] - public async Task Interact(CommandContext ctx) - { - /* Trigger the Typing... in discord */ - await ctx.TriggerTypingAsync(); + /* Send the message "I'm Alive!" to the channel the message was recieved from */ + await ctx.RespondAsync("I'm alive!"); + } - /* Send the message "I'm Alive!" to the channel the message was recieved from */ - await ctx.RespondAsync("How are you today?"); + [Command("interact")] + [Description("Simple command to test interaction!")] + public async Task Interact(CommandContext ctx) + { + /* Trigger the Typing... in discord */ + await ctx.TriggerTypingAsync(); - var intr = ctx.Client.GetInteractivityModule(); // Grab the interactivity module - var reminderContent = await intr.WaitForMessageAsync( - c => c.Author.Id == ctx.Message.Author.Id, // Make sure the response is from the same person who sent the command - TimeSpan.FromSeconds(60) // Wait 60 seconds for a response instead of the default 30 we set earlier! - ); + /* Send the message "I'm Alive!" to the channel the message was recieved from */ + await ctx.RespondAsync("How are you today?"); - // You can also check for a specific message by doing something like - // c => c.Content == "something" + var intr = ctx.Client.GetInteractivity(); // Grab the interactivity module + var reminderContent = await intr.WaitForMessageAsync( + c => c.Author.Id == ctx.Message.Author.Id, // Make sure the response is from the same person who sent the command + TimeSpan.FromSeconds(60) // Wait 60 seconds for a response instead of the default 30 we set earlier! + ); - // Null if the user didn't respond before the timeout - if (reminderContent == null) - { - await ctx.RespondAsync("Sorry, I didn't get a response!"); - return; - } + // You can also check for a specific message by doing something like + // c => c.Content == "something" - // Homework: have this change depending on if they say "good" or "bad", etc. - await ctx.RespondAsync("Sucks to suck"); + // Null if the user didn't respond before the timeout + if (reminderContent.Result == null) + { + await ctx.RespondAsync("Sorry, I didn't get a response!"); + return; } + + // Homework: have this change depending on if they say "good" or "bad", etc. + await ctx.RespondAsync("Sucks to suck"); } } \ No newline at end of file diff --git a/Commands/CopyChannelCommand.cs b/Commands/CopyChannelCommand.cs index 66b0cc3..6f68144 100644 --- a/Commands/CopyChannelCommand.cs +++ b/Commands/CopyChannelCommand.cs @@ -3,139 +3,183 @@ using DSharpPlus.CommandsNext.Attributes; using DSharpPlus.Entities; using DSharpPlus.Interactivity; +using DSharpPlus.Interactivity.Extensions; using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using static DSharpPlus.Entities.DiscordEmbedBuilder; -namespace PoisnCopy.Commands +namespace PoisnCopy.Commands; + +[RequirePermissions( + Permissions.SendMessages + & Permissions.AccessChannels + & Permissions.ManageChannels + & Permissions.ReadMessageHistory + & Permissions.EmbedLinks + & Permissions.AttachFiles +)] +[Hidden] +public class CopyChannelCommand : BaseCommandModule, IModule { - [RequirePermissions(Permissions.Administrator)] - [Hidden] - public class CopyChannelCommand : IModule + [Command("copychannel")] + [Description("Copy a channel")] + public async Task CopyChannel(CommandContext ctx) { - [Command("copychannel")] - [Description("Copy a channel")] - public async Task CopyChannel(CommandContext ctx) - { - await ctx.TriggerTypingAsync(); + await ctx.TriggerTypingAsync(); - await ctx.RespondAsync("Which Channel would you like to copy? (copy and paste the Id) Pleaes wait while I find all of your channels, I will give you a message when I have found them all."); + await ctx.RespondAsync("One moment as I compile the list of channels"); - await ctx.TriggerTypingAsync(); - var textChannels = ctx.Guild.Channels.Where(i => i.Type == ChannelType.Text).ToList(); - foreach (var txtChan in textChannels) + await ctx.TriggerTypingAsync(); + var textChannels = ctx.Guild.Channels.Where(i => i.Value.Type == ChannelType.Text).ToList(); + List messages = + new() { - await ctx.TriggerTypingAsync(); - await ctx.RespondAsync($"`{txtChan.Id}-{txtChan.Name}`"); - await ctx.TriggerTypingAsync(); - } - await ctx.RespondAsync($"Thats all of the channels!"); + "Which Channel would you like to copy? (copy and paste the Id) Pleaes wait while I find all of your channels, I will give you a message when I have found them all." + }; - var intr = ctx.Client.GetInteractivityModule(); // Grab the interactivity module - var response = await intr.WaitForMessageAsync( - c => c.Author.Id == ctx.Message.Author.Id, // Make sure the response is from the same person who sent the command - TimeSpan.FromSeconds(60) // Wait 60 seconds for a response instead of the default 30 we set earlier! - ); + foreach (var txtChan in textChannels) + { + messages.Add($"`{txtChan.Value.Id}-{txtChan.Value.Name}`"); + //var dismsg = await ctx.Channel.SendMessageAsync( + // $"`{txtChan.Value.Id}-{txtChan.Value.Name}`" + // ); + //await dismsg.CreateReactionAsync(DiscordEmoji.FromName(ctx.Client, ":arrow_up_small:")); + } - if (response == null) - { - await ctx.RespondAsync("Sorry, I didn't get a response!"); - return; - } + messages.Add("Thats all of the channels!"); + var msg = await ctx.RespondAsync(string.Join("\n", messages)); - var selectedChannel = textChannels.FirstOrDefault(i => i.Id.ToString() == response.Message.Content); + //wait for reaction from user - if (selectedChannel == null) - { - await ctx.RespondAsync("Sorry, but that channel does not exist!"); - return; - } + var intr = ctx.Client.GetInteractivity(); // Grab the interactivity module + var response = await intr.WaitForMessageAsync( + c => c.Author.Id == ctx.Message.Author.Id, + TimeSpan.FromSeconds(60) + ); - await ctx.RespondAsync($"Copy command: `pc.loadchannel {selectedChannel.GuildId} {selectedChannel.Id}`"); + if (response.Result == null) + { + await ctx.RespondAsync("Sorry, I didn't get a response!"); + return; } - [Command("loadchannel")] - [Description("Load a copied channel")] - public async Task LoadChannel(CommandContext ctx, ulong guildId, ulong channelId) + var selectedChannel = textChannels.FirstOrDefault( + i => i.Value.Id.ToString() == response.Result.Content + ); + + if (selectedChannel.Value == null) { - var guild = await ctx.Client.GetGuildAsync(guildId); - var selectedChannel = guild.GetChannel(channelId); + await ctx.RespondAsync("Sorry, but that channel does not exist!"); + return; + } - await ctx.RespondAsync("What do you want the new channel to be named?"); + await ctx.RespondAsync( + $"Copy command: `pc.loadchannel {selectedChannel.Value.GuildId} {selectedChannel.Value.Id}`" + ); + } - var intr = ctx.Client.GetInteractivityModule(); // Grab the interactivity module - var response = await intr.WaitForMessageAsync( - c => c.Author.Id == ctx.Message.Author.Id, // Make sure the response is from the same person who sent the command - TimeSpan.FromSeconds(60) // Wait 60 seconds for a response instead of the default 30 we set earlier! - ); + [Command("loadchannel")] + [Description("Load a copied channel")] + public async Task LoadChannel(CommandContext ctx, ulong guildId, ulong channelId) + { + var guild = await ctx.Client.GetGuildAsync(guildId); + var selectedChannel = guild.GetChannel(channelId); - if (response == null) - { - await ctx.RespondAsync("Sorry, I didn't get a response!"); - return; - } + await ctx.RespondAsync("What do you want the new channel to be named?"); - if (string.IsNullOrEmpty(response.Message.Content)) - { - await ctx.RespondAsync("Name cannot be empty!"); - return; - } + var intr = ctx.Client.GetInteractivity(); // Grab the interactivity module + var response = await intr.WaitForMessageAsync( + c => c.Author.Id == ctx.Message.Author.Id, // Make sure the response is from the same person who sent the command + TimeSpan.FromSeconds(60) // Wait 60 seconds for a response instead of the default 30 we set earlier! + ); - var channelName = response.Message.Content; + if (response.Result == null) + { + await ctx.RespondAsync("Sorry, I didn't get a response!"); + return; + } - await ctx.RespondAsync("Starting copy..."); + if (string.IsNullOrEmpty(response.Result.Content)) + { + await ctx.Channel.SendMessageAsync("Name cannot be empty!"); + return; + } - await ctx.RespondAsync("Collecting messages..."); + var channelName = response.Result.Content; - var messag = await selectedChannel.GetMessagesAsync(); + await ctx.Channel.SendMessageAsync("Starting copy..."); - var messCopy = messag.ToList(); + await ctx.Channel.SendMessageAsync("Collecting messages..."); - var more = await selectedChannel.GetMessagesAsync(100, messag.LastOrDefault().Id); + var messag = await selectedChannel.GetMessagesAsync(); - while (more.Count > 0) - { - messCopy.AddRange(more); - more = await selectedChannel.GetMessagesAsync(100, more.LastOrDefault().Id); - } + var messCopy = messag.ToList(); + var more = await selectedChannel.GetMessagesAsync(100); + + while (more.Count > 0) + { + messCopy.AddRange(more); + more = await selectedChannel.GetMessagesBeforeAsync(more.LastOrDefault().Id, 100); + } - await ctx.RespondAsync("Organizing messages..."); + await ctx.Channel.SendMessageAsync("Organizing messages..."); - messCopy.Reverse(); + messCopy.Reverse(); - var newMess = new List(); + var newMess = new List(); - await ctx.RespondAsync("Creating channel..."); + await ctx.Channel.SendMessageAsync("Creating channel..."); - var newChan = await ctx.Guild.CreateChannelAsync(channelName, selectedChannel.Type); + var newChan = await ctx.Guild.CreateChannelAsync(channelName, selectedChannel.Type); - await ctx.RespondAsync($"Posting {messCopy.Count} messages... (this could take awhile)"); + await ctx.Channel.SendMessageAsync( + $"Posting {messCopy.Count} messages... (this could take awhile)" + ); - foreach (var mes in messCopy) + foreach (var mes in messCopy) + { + if (!string.IsNullOrEmpty(mes.Content)) { - if (!string.IsNullOrEmpty(mes.Content)) + var whAu = new EmbedAuthor + { + Name = mes.Author.Username, + IconUrl = mes.Author.AvatarUrl + }; + var what = new DiscordEmbedBuilder { - var whAu = new EmbedAuthor { Name = mes.Author.Username, IconUrl = mes.Author.AvatarUrl }; - var what = new DiscordEmbedBuilder { Description = mes.Content, Author = whAu, Timestamp = mes.Timestamp }; + Description = mes.Content, + Author = whAu, + Timestamp = mes.Timestamp + }; - await newChan.SendMessageAsync(null, false, what); - } + await newChan.SendMessageAsync(what); + await Task.Delay(800); + } - if (mes.Attachments.Count > 0) + if (mes.Attachments.Count > 0) + { + foreach (var att in mes.Attachments) { - foreach (var att in mes.Attachments) + var whAu = new EmbedAuthor + { + Name = mes.Author.Username, + IconUrl = mes.Author.AvatarUrl + }; + var what = new DiscordEmbedBuilder { - var whAu = new EmbedAuthor { Name = mes.Author.Username, IconUrl = mes.Author.AvatarUrl }; - var what = new DiscordEmbedBuilder { ImageUrl = att.Url, Author = whAu, Timestamp = mes.Timestamp }; + ImageUrl = att.Url, + Author = whAu, + Timestamp = mes.Timestamp + }; - await newChan.SendMessageAsync(null, false, what); - } + await newChan.SendMessageAsync(what); + await Task.Delay(800); } } - - await ctx.RespondAsync($"{newChan.Name} copy complete!"); } + + await ctx.RespondAsync($"{newChan.Name} copy complete!"); } } \ No newline at end of file diff --git a/Images/snapshot-bmc-button.png b/Images/snapshot-bmc-button.png new file mode 100644 index 0000000..71ae4b9 Binary files /dev/null and b/Images/snapshot-bmc-button.png differ diff --git a/LICENSE b/LICENSE index 7867120..5f7a7c4 100644 --- a/LICENSE +++ b/LICENSE @@ -1,21 +1,373 @@ -MIT License - -Copyright (c) 2021 PoisnFang - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. +Mozilla Public License Version 2.0 +================================== + +1. Definitions +-------------- + +1.1. "Contributor" + means each individual or legal entity that creates, contributes to + the creation of, or owns Covered Software. + +1.2. "Contributor Version" + means the combination of the Contributions of others (if any) used + by a Contributor and that particular Contributor's Contribution. + +1.3. "Contribution" + means Covered Software of a particular Contributor. + +1.4. "Covered Software" + means Source Code Form to which the initial Contributor has attached + the notice in Exhibit A, the Executable Form of such Source Code + Form, and Modifications of such Source Code Form, in each case + including portions thereof. + +1.5. "Incompatible With Secondary Licenses" + means + + (a) that the initial Contributor has attached the notice described + in Exhibit B to the Covered Software; or + + (b) that the Covered Software was made available under the terms of + version 1.1 or earlier of the License, but not also under the + terms of a Secondary License. + +1.6. "Executable Form" + means any form of the work other than Source Code Form. + +1.7. "Larger Work" + means a work that combines Covered Software with other material, in + a separate file or files, that is not Covered Software. + +1.8. "License" + means this document. + +1.9. "Licensable" + means having the right to grant, to the maximum extent possible, + whether at the time of the initial grant or subsequently, any and + all of the rights conveyed by this License. + +1.10. "Modifications" + means any of the following: + + (a) any file in Source Code Form that results from an addition to, + deletion from, or modification of the contents of Covered + Software; or + + (b) any new file in Source Code Form that contains any Covered + Software. + +1.11. "Patent Claims" of a Contributor + means any patent claim(s), including without limitation, method, + process, and apparatus claims, in any patent Licensable by such + Contributor that would be infringed, but for the grant of the + License, by the making, using, selling, offering for sale, having + made, import, or transfer of either its Contributions or its + Contributor Version. + +1.12. "Secondary License" + means either the GNU General Public License, Version 2.0, the GNU + Lesser General Public License, Version 2.1, the GNU Affero General + Public License, Version 3.0, or any later versions of those + licenses. + +1.13. "Source Code Form" + means the form of the work preferred for making modifications. + +1.14. "You" (or "Your") + means an individual or a legal entity exercising rights under this + License. For legal entities, "You" includes any entity that + controls, is controlled by, or is under common control with You. For + purposes of this definition, "control" means (a) the power, direct + or indirect, to cause the direction or management of such entity, + whether by contract or otherwise, or (b) ownership of more than + fifty percent (50%) of the outstanding shares or beneficial + ownership of such entity. + +2. License Grants and Conditions +-------------------------------- + +2.1. Grants + +Each Contributor hereby grants You a world-wide, royalty-free, +non-exclusive license: + +(a) under intellectual property rights (other than patent or trademark) + Licensable by such Contributor to use, reproduce, make available, + modify, display, perform, distribute, and otherwise exploit its + Contributions, either on an unmodified basis, with Modifications, or + as part of a Larger Work; and + +(b) under Patent Claims of such Contributor to make, use, sell, offer + for sale, have made, import, and otherwise transfer either its + Contributions or its Contributor Version. + +2.2. Effective Date + +The licenses granted in Section 2.1 with respect to any Contribution +become effective for each Contribution on the date the Contributor first +distributes such Contribution. + +2.3. Limitations on Grant Scope + +The licenses granted in this Section 2 are the only rights granted under +this License. No additional rights or licenses will be implied from the +distribution or licensing of Covered Software under this License. +Notwithstanding Section 2.1(b) above, no patent license is granted by a +Contributor: + +(a) for any code that a Contributor has removed from Covered Software; + or + +(b) for infringements caused by: (i) Your and any other third party's + modifications of Covered Software, or (ii) the combination of its + Contributions with other software (except as part of its Contributor + Version); or + +(c) under Patent Claims infringed by Covered Software in the absence of + its Contributions. + +This License does not grant any rights in the trademarks, service marks, +or logos of any Contributor (except as may be necessary to comply with +the notice requirements in Section 3.4). + +2.4. Subsequent Licenses + +No Contributor makes additional grants as a result of Your choice to +distribute the Covered Software under a subsequent version of this +License (see Section 10.2) or under the terms of a Secondary License (if +permitted under the terms of Section 3.3). + +2.5. Representation + +Each Contributor represents that the Contributor believes its +Contributions are its original creation(s) or it has sufficient rights +to grant the rights to its Contributions conveyed by this License. + +2.6. Fair Use + +This License is not intended to limit any rights You have under +applicable copyright doctrines of fair use, fair dealing, or other +equivalents. + +2.7. Conditions + +Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted +in Section 2.1. + +3. Responsibilities +------------------- + +3.1. Distribution of Source Form + +All distribution of Covered Software in Source Code Form, including any +Modifications that You create or to which You contribute, must be under +the terms of this License. You must inform recipients that the Source +Code Form of the Covered Software is governed by the terms of this +License, and how they can obtain a copy of this License. You may not +attempt to alter or restrict the recipients' rights in the Source Code +Form. + +3.2. Distribution of Executable Form + +If You distribute Covered Software in Executable Form then: + +(a) such Covered Software must also be made available in Source Code + Form, as described in Section 3.1, and You must inform recipients of + the Executable Form how they can obtain a copy of such Source Code + Form by reasonable means in a timely manner, at a charge no more + than the cost of distribution to the recipient; and + +(b) You may distribute such Executable Form under the terms of this + License, or sublicense it under different terms, provided that the + license for the Executable Form does not attempt to limit or alter + the recipients' rights in the Source Code Form under this License. + +3.3. Distribution of a Larger Work + +You may create and distribute a Larger Work under terms of Your choice, +provided that You also comply with the requirements of this License for +the Covered Software. If the Larger Work is a combination of Covered +Software with a work governed by one or more Secondary Licenses, and the +Covered Software is not Incompatible With Secondary Licenses, this +License permits You to additionally distribute such Covered Software +under the terms of such Secondary License(s), so that the recipient of +the Larger Work may, at their option, further distribute the Covered +Software under the terms of either this License or such Secondary +License(s). + +3.4. Notices + +You may not remove or alter the substance of any license notices +(including copyright notices, patent notices, disclaimers of warranty, +or limitations of liability) contained within the Source Code Form of +the Covered Software, except that You may alter any license notices to +the extent required to remedy known factual inaccuracies. + +3.5. Application of Additional Terms + +You may choose to offer, and to charge a fee for, warranty, support, +indemnity or liability obligations to one or more recipients of Covered +Software. However, You may do so only on Your own behalf, and not on +behalf of any Contributor. You must make it absolutely clear that any +such warranty, support, indemnity, or liability obligation is offered by +You alone, and You hereby agree to indemnify every Contributor for any +liability incurred by such Contributor as a result of warranty, support, +indemnity or liability terms You offer. You may include additional +disclaimers of warranty and limitations of liability specific to any +jurisdiction. + +4. Inability to Comply Due to Statute or Regulation +--------------------------------------------------- + +If it is impossible for You to comply with any of the terms of this +License with respect to some or all of the Covered Software due to +statute, judicial order, or regulation then You must: (a) comply with +the terms of this License to the maximum extent possible; and (b) +describe the limitations and the code they affect. Such description must +be placed in a text file included with all distributions of the Covered +Software under this License. Except to the extent prohibited by statute +or regulation, such description must be sufficiently detailed for a +recipient of ordinary skill to be able to understand it. + +5. Termination +-------------- + +5.1. The rights granted under this License will terminate automatically +if You fail to comply with any of its terms. However, if You become +compliant, then the rights granted under this License from a particular +Contributor are reinstated (a) provisionally, unless and until such +Contributor explicitly and finally terminates Your grants, and (b) on an +ongoing basis, if such Contributor fails to notify You of the +non-compliance by some reasonable means prior to 60 days after You have +come back into compliance. Moreover, Your grants from a particular +Contributor are reinstated on an ongoing basis if such Contributor +notifies You of the non-compliance by some reasonable means, this is the +first time You have received notice of non-compliance with this License +from such Contributor, and You become compliant prior to 30 days after +Your receipt of the notice. + +5.2. If You initiate litigation against any entity by asserting a patent +infringement claim (excluding declaratory judgment actions, +counter-claims, and cross-claims) alleging that a Contributor Version +directly or indirectly infringes any patent, then the rights granted to +You by any and all Contributors for the Covered Software under Section +2.1 of this License shall terminate. + +5.3. In the event of termination under Sections 5.1 or 5.2 above, all +end user license agreements (excluding distributors and resellers) which +have been validly granted by You or Your distributors under this License +prior to termination shall survive termination. + +************************************************************************ +* * +* 6. Disclaimer of Warranty * +* ------------------------- * +* * +* Covered Software is provided under this License on an "as is" * +* basis, without warranty of any kind, either expressed, implied, or * +* statutory, including, without limitation, warranties that the * +* Covered Software is free of defects, merchantable, fit for a * +* particular purpose or non-infringing. The entire risk as to the * +* quality and performance of the Covered Software is with You. * +* Should any Covered Software prove defective in any respect, You * +* (not any Contributor) assume the cost of any necessary servicing, * +* repair, or correction. This disclaimer of warranty constitutes an * +* essential part of this License. No use of any Covered Software is * +* authorized under this License except under this disclaimer. * +* * +************************************************************************ + +************************************************************************ +* * +* 7. Limitation of Liability * +* -------------------------- * +* * +* Under no circumstances and under no legal theory, whether tort * +* (including negligence), contract, or otherwise, shall any * +* Contributor, or anyone who distributes Covered Software as * +* permitted above, be liable to You for any direct, indirect, * +* special, incidental, or consequential damages of any character * +* including, without limitation, damages for lost profits, loss of * +* goodwill, work stoppage, computer failure or malfunction, or any * +* and all other commercial damages or losses, even if such party * +* shall have been informed of the possibility of such damages. This * +* limitation of liability shall not apply to liability for death or * +* personal injury resulting from such party's negligence to the * +* extent applicable law prohibits such limitation. Some * +* jurisdictions do not allow the exclusion or limitation of * +* incidental or consequential damages, so this exclusion and * +* limitation may not apply to You. * +* * +************************************************************************ + +8. Litigation +------------- + +Any litigation relating to this License may be brought only in the +courts of a jurisdiction where the defendant maintains its principal +place of business and such litigation shall be governed by laws of that +jurisdiction, without reference to its conflict-of-law provisions. +Nothing in this Section shall prevent a party's ability to bring +cross-claims or counter-claims. + +9. Miscellaneous +---------------- + +This License represents the complete agreement concerning the subject +matter hereof. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the extent +necessary to make it enforceable. Any law or regulation which provides +that the language of a contract shall be construed against the drafter +shall not be used to construe this License against a Contributor. + +10. Versions of the License +--------------------------- + +10.1. New Versions + +Mozilla Foundation is the license steward. Except as provided in Section +10.3, no one other than the license steward has the right to modify or +publish new versions of this License. Each version will be given a +distinguishing version number. + +10.2. Effect of New Versions + +You may distribute the Covered Software under the terms of the version +of the License under which You originally received the Covered Software, +or under the terms of any subsequent version published by the license +steward. + +10.3. Modified Versions + +If you create software not governed by this License, and you want to +create a new license for such software, you may create and use a +modified version of this License if you rename the license and remove +any references to the name of the license steward (except to note that +such modified license differs from this License). + +10.4. Distributing Source Code Form that is Incompatible With Secondary +Licenses + +If You choose to distribute Source Code Form that is Incompatible With +Secondary Licenses under the terms of this version of the License, the +notice described in Exhibit B of this License must be attached. + +Exhibit A - Source Code Form License Notice +------------------------------------------- + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at https://mozilla.org/MPL/2.0/. + +If it is not possible or desirable to put the notice in a particular +file, then You may include the notice in a location (such as a LICENSE +file in a relevant directory) where a recipient would be likely to look +for such a notice. + +You may add additional accurate notices of copyright ownership. + +Exhibit B - "Incompatible With Secondary Licenses" Notice +--------------------------------------------------------- + + This Source Code Form is "Incompatible With Secondary Licenses", as + defined by the Mozilla Public License, v. 2.0. \ No newline at end of file diff --git a/PoisnCopy.csproj b/PoisnCopy.csproj index 30ce3c3..d7f086e 100644 --- a/PoisnCopy.csproj +++ b/PoisnCopy.csproj @@ -2,16 +2,18 @@ Exe - net5.0 + net6.0 + enable + enable - - - - - - + + + + + + diff --git a/Program.cs b/Program.cs index 3efc8c6..2688c54 100644 --- a/Program.cs +++ b/Program.cs @@ -7,6 +7,10 @@ using DSharpPlus.CommandsNext; using DSharpPlus.Interactivity; using Microsoft.Extensions.Configuration; +using DSharpPlus.Interactivity.Extensions; +using DSharpPlus.Interactivity.Enums; +using System.Collections.Generic; +using Microsoft.Extensions.DependencyInjection; namespace PoisnCopy { @@ -20,8 +24,8 @@ internal class Program /* These are the discord library's main classes */ private DiscordClient _discord; - private CommandsNextModule _commands; - private InteractivityModule _interactivity; + private CommandsNextExtension _commands; + private InteractivityExtension _interactivity; /* Use the async main to create an instance of the class and await it(async main is only available in C# 7.1 onwards). */ @@ -43,38 +47,52 @@ private async Task InitBot(string[] args) // Create the DSharpPlus client Console.WriteLine("[info] Creating discord client.."); - _discord = new DiscordClient(new DiscordConfiguration - { - Token = _config.GetValue("discord:token"), - TokenType = TokenType.Bot - }); + _discord = new DiscordClient( + new DiscordConfiguration + { + Token = _config.GetValue("discord:token"), + TokenType = TokenType.Bot, + Intents = DiscordIntents.AllUnprivileged | DiscordIntents.MessageContents + } + ); // Create the interactivity module(I'll show you how to use this later on) - _interactivity = _discord.UseInteractivity(new InteractivityConfiguration() - { - PaginationBehaviour = TimeoutBehaviour.Delete, // What to do when a pagination request times out - PaginationTimeout = TimeSpan.FromSeconds(30), // How long to wait before timing out - Timeout = TimeSpan.FromSeconds(30) // Default time to wait for interactive commands like waiting for a message or a reaction - }); + _interactivity = _discord.UseInteractivity( + new InteractivityConfiguration() + { + PaginationBehaviour = PaginationBehaviour.WrapAround, // What to do when a pagination request times out + PaginationDeletion = PaginationDeletion.DeleteMessage, // How long to wait before timing out + Timeout = TimeSpan.FromSeconds(30) // Default time to wait for interactive commands like waiting for a message or a reaction + } + ); // Build dependancies and then create the commands module. - var deps = BuildDeps(); - _commands = _discord.UseCommandsNext(new CommandsNextConfiguration - { - StringPrefix = _config.GetValue("discord:CommandPrefix"), // Load the command prefix(what comes before the command, eg "!" or "/") from our config file - Dependencies = deps // Pass the dependancies - }); + var services = BuildServices(); + _commands = _discord.UseCommandsNext( + new CommandsNextConfiguration + { + StringPrefixes = new List + { + _config.GetValue("discord:CommandPrefix") + }, // Load the command prefix(what comes before the command, eg "!" or "/") from our config file + Services = services, + EnableDms = false + } + ); Console.WriteLine("[info] Loading command modules.."); var type = typeof(IModule); // Get the type of our interface - var types = AppDomain.CurrentDomain.GetAssemblies() // Get the assemblies associated with our project + var types = AppDomain.CurrentDomain + .GetAssemblies() // Get the assemblies associated with our project .SelectMany(s => s.GetTypes()) // Get all the types .Where(p => type.IsAssignableFrom(p) && !p.IsInterface); // Filter to find any type that can be assigned to an IModule var typeList = types as Type[] ?? types.ToArray(); // Convert to an array foreach (var t in typeList) - _commands.RegisterCommands(t); // Loop through the list and register each command module with CommandsNext + { + _commands.RegisterCommands(t); + } Console.WriteLine($"[info] Loaded {typeList.Count()} modules."); await RunAsync(args); @@ -95,7 +113,7 @@ private async Task RunAsync(string[] args) Console.WriteLine("Connecting.."); await _discord.ConnectAsync(); Console.WriteLine("Connected!"); - var connections = _discord.Presences.Count; + var connections = _discord.Guilds.Count; Console.WriteLine($"I am running on {connections} servers"); // Keep the bot running until the cancellation token requests we stop @@ -108,16 +126,16 @@ private async Task RunAsync(string[] args) We can then access these in our command modules. */ - private DependencyCollection BuildDeps() + private ServiceProvider BuildServices() { - using var deps = new DependencyCollectionBuilder(); + var deps = new ServiceCollection(); - deps.AddInstance(_interactivity) // Add interactivity - .AddInstance(_cts) // Add the cancellation token - .AddInstance(_config) // Add our config - .AddInstance(_discord); // Add the discord client + deps.AddSingleton(_interactivity) // Add interactivity + .AddSingleton(_cts) // Add the cancellation token + .AddSingleton(_config) // Add our config + .AddSingleton(_discord); // Add the discord client - return deps.Build(); + return deps.BuildServiceProvider(); } } } \ No newline at end of file diff --git a/README.md b/README.md index 8420a00..db29ede 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,17 @@ +# ALERT +PoisnCopy is now on 100 servers which is the capacity based on [this post from Discord](https://support.discord.com/hc/en-us/articles/4410940809111). I do not have any plans to Verify my bot. this decision is not an easy one as I know this bot is very useful to many people as Discord does not offer this service themselves. I frankly do not have time to spend getting this bot into compliance. Should demand change for this, I might reconsider. + +Therefore, _**if you try to add the bot to your servers it won't work.**_ Feel free to contact me directly with question: posinfang@poisnfang.com +### Show Some Support +Buy Me A Coffee # PoisnCopy Discord channel copy bot Add the bot to BOTH of your servers using this link. (NOTE: You must be the OWNER (Not just an admin) of BOTH servers) https://discordapp.com/api/oauth2/authorize?client_id=768322637574570015&scope=bot&permissions=8 +**DISCLAIMER: There is no guarantee that I will keep this bot running on the server at any given point, use at your own risk** + Use: `pc.copychannel` The bot will list the channels in the server that you are typing in. You must enter the ID of the channel that you want to copy and then I will give you a command to copy and paste in the new server. @@ -42,4 +50,4 @@ i.e. Contributions are welcome! Just create a PR and I will review it. -In order to run the project on your own, you will need to rename the `test-config.json` file to `config.json` and then you need to fill in the corresponding fields from your https://discord.com/developers/applications specific application. I will not go into specifics on creating your own discord bot here. \ No newline at end of file +In order to run the project on your own, you will need to rename the `test-config.json` file to `config.json` and then you need to fill in the corresponding fields from your https://discord.com/developers/applications specific application. I will not go into specifics on creating your own discord bot here. diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 24909b1..8ee142d 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -16,10 +16,10 @@ variables: steps: - task: UseDotNet@2 - displayName: 'Use .NET Core sdk 5.x' + displayName: 'Use .NET Core sdk 6.x' inputs: packageType: 'sdk' - version: '5.x' + version: '6.x' includePreviewVersions: true - script: dotnet build --configuration $(buildConfiguration) @@ -35,6 +35,6 @@ steps: zipAfterPublish: false - task: PublishBuildArtifacts@1 inputs: - PathtoPublish: 'bin/Release/net5.0/publish' + PathtoPublish: 'bin/Release/net6.0/publish' ArtifactName: 'published' publishLocation: 'Container' \ No newline at end of file